This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 89fb7eb..e19475e 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1829,7 +1829,7 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
        {
                case SIOCOUTQ:
                        amount = atomic_read(&sk->sk_wmem_alloc);
-                       err = put_user(amount, (int *)arg);
+                       err = put_user(amount, (int __user *)arg);
                        break;
                case SIOCINQ:
                {
@@ -1844,12 +1844,12 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        if (skb)
                                amount=skb->len;
                        spin_unlock(&sk->sk_receive_queue.lock);
-                       err = put_user(amount, (int *)arg);
+                       err = put_user(amount, (int __user *)arg);
                        break;
                }
 
                default:
-                       err = dev_ioctl(cmd, (void *)arg);
+                       err = dev_ioctl(cmd, (void __user *)arg);
                        break;
        }
        return err;