Make sock_no_{get|set}opt() use the proper __user annotation

diff --git a/include/net/sock.h b/include/net/sock.h
index 115ace226a2add1d95bb9c91db55212842b8f1ee..256d2fd0434c833d34cd20e48f0a4e27b6ad6b46 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -623,9 +623,9 @@ extern int                      sock_no_ioctl(struct socket *, unsigned int,
 extern int                     sock_no_listen(struct socket *, int);
 extern int                      sock_no_shutdown(struct socket *, int);
 extern int                     sock_no_getsockopt(struct socket *, int , int,
-                                                  char *, int *);
+                                                  char __user *, int __user *);
 extern int                     sock_no_setsockopt(struct socket *, int, int,
-                                                  char *, int);
+                                                  char __user *, int);
 extern int                      sock_no_sendmsg(struct kiocb *, struct socket *,
                                                struct msghdr *, size_t);
 extern int                      sock_no_recvmsg(struct kiocb *, struct socket *,

diff --git a/net/core/sock.c b/net/core/sock.c
index a06816a080ea7bb48adf678a95e12c97c14bbc32..1f6a12b8658068678e4d547ee8d79894bd56c8c5 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -973,13 +973,13 @@ int sock_no_shutdown(struct socket *sock, int how)
 }
 
 int sock_no_setsockopt(struct socket *sock, int level, int optname,
-                   char *optval, int optlen)
+                   char __user *optval, int optlen)
 {
        return -EOPNOTSUPP;
 }
 
 int sock_no_getsockopt(struct socket *sock, int level, int optname,
-                   char *optval, int *optlen)
+                   char __user *optval, int __user *optlen)
 {
        return -EOPNOTSUPP;
 }