This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / netrom / af_netrom.c

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index bb5ac58..1e3fe72 100644 (file)
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -297,7 +297,7 @@ void nr_destroy_socket(struct sock *sk)
  */
 
 static int nr_setsockopt(struct socket *sock, int level, int optname,
-       char *optval, int optlen)
+       char __user *optval, int optlen)
 {
        struct sock *sk = sock->sk;
        nr_cb *nr = nr_sk(sk);
@@ -309,7 +309,7 @@ static int nr_setsockopt(struct socket *sock, int level, int optname,
        if (optlen < sizeof(int))
                return -EINVAL;
 
-       if (get_user(opt, (int *)optval))
+       if (get_user(opt, (int __user *)optval))
                return -EFAULT;
 
        switch (optname) {
@@ -349,7 +349,7 @@ static int nr_setsockopt(struct socket *sock, int level, int optname,
 }
 
 static int nr_getsockopt(struct socket *sock, int level, int optname,
-       char *optval, int *optlen)
+       char __user *optval, int __user *optlen)
 {
        struct sock *sk = sock->sk;
        nr_cb *nr = nr_sk(sk);
@@ -1202,7 +1202,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
        case SIOCGSTAMP:
                ret = -EINVAL;
                if (sk != NULL)
-                       ret = sock_get_timestamp(sk, (struct timeval *)arg);
+                       ret = sock_get_timestamp(sk, (struct timeval __user *)arg);
                release_sock(sk);
                return ret;
 
@@ -1228,7 +1228,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 
        default:
                release_sock(sk);
-               return dev_ioctl(cmd, (void *)arg);
+               return dev_ioctl(cmd, (void __user *)arg);
        }
        release_sock(sk);