X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fllc%2Faf_llc.c;h=d088fe8f6a799e833d360059cdbb0b76460c3f0a;hb=2c66a62d2d9e2315e6e748b96643f7f141c4d017;hp=cd5e993d9546f5dae98c099c13ce8171fd21b6e4;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index cd5e993d9..d088fe8f6 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -867,7 +867,7 @@ out:
 static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
 			unsigned long arg)
 {
-	return dev_ioctl(cmd, (void *)arg);
+	return dev_ioctl(cmd, (void __user *)arg);
 }
 
 /**
@@ -881,7 +881,7 @@ static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
  *	Set various connection specific parameters.
  */
 static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
-			     char *optval, int optlen)
+			     char __user *optval, int optlen)
 {
 	struct sock *sk = sock->sk;
 	struct llc_opt *llc = llc_sk(sk);
@@ -890,7 +890,7 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
 	lock_sock(sk);
 	if (level != SOL_LLC || optlen != sizeof(int))
 		goto out;
-	rc = get_user(opt, (int *)optval);
+	rc = get_user(opt, (int __user *)optval);
 	if (rc)
 		goto out;
 	rc = -EINVAL;
@@ -956,7 +956,7 @@ out:
  *	Get connection specific socket information.
  */
 static int llc_ui_getsockopt(struct socket *sock, int level, int optname,
-			     char *optval, int *optlen)
+			     char __user *optval, int __user *optlen)
 {
 	struct sock *sk = sock->sk;
 	struct llc_opt *llc = llc_sk(sk);