This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / x25 / af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 614f959..9863ccd 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -363,7 +363,7 @@ void x25_destroy_socket(struct sock *sk)
  */
 
 static int x25_setsockopt(struct socket *sock, int level, int optname,
-                         char *optval, int optlen)
+                         char __user *optval, int optlen)
 {
        int opt;
        struct sock *sk = sock->sk;
@@ -377,7 +377,7 @@ static int x25_setsockopt(struct socket *sock, int level, int optname,
                goto out;
 
        rc = -EFAULT;
-       if (get_user(opt, (int *)optval))
+       if (get_user(opt, (int __user *)optval))
                goto out;
 
        x25_sk(sk)->qbitincl = !!opt;
@@ -387,7 +387,7 @@ out:
 }
 
 static int x25_getsockopt(struct socket *sock, int level, int optname,
-                         char *optval, int *optlen)
+                         char __user *optval, int __user *optlen)
 {
        struct sock *sk = sock->sk;
        int val, len, rc = -ENOPROTOOPT;
@@ -1209,7 +1209,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        rc = -EINVAL;
                        if (sk)
                                rc = sock_get_timestamp(sk, 
-                                               (struct timeval *)arg); 
+                                               (struct timeval __user *)arg); 
                        break;
                case SIOCGIFADDR:
                case SIOCSIFADDR:
@@ -1306,7 +1306,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                }
 
                default:
-                       rc = dev_ioctl(cmd, (void *)arg);
+                       rc = dev_ioctl(cmd, (void __user *)arg);
                        break;
        }