Commit 6ff18bff authored by Linus Torvalds's avatar Linus Torvalds

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

parent 162ed082
...@@ -623,9 +623,9 @@ extern int sock_no_ioctl(struct socket *, unsigned int, ...@@ -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_listen(struct socket *, int);
extern int sock_no_shutdown(struct socket *, int); extern int sock_no_shutdown(struct socket *, int);
extern int sock_no_getsockopt(struct socket *, int , 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, extern int sock_no_setsockopt(struct socket *, int, int,
char *, int); char __user *, int);
extern int sock_no_sendmsg(struct kiocb *, struct socket *, extern int sock_no_sendmsg(struct kiocb *, struct socket *,
struct msghdr *, size_t); struct msghdr *, size_t);
extern int sock_no_recvmsg(struct kiocb *, struct socket *, extern int sock_no_recvmsg(struct kiocb *, struct socket *,
......
...@@ -973,13 +973,13 @@ int sock_no_shutdown(struct socket *sock, int how) ...@@ -973,13 +973,13 @@ int sock_no_shutdown(struct socket *sock, int how)
} }
int sock_no_setsockopt(struct socket *sock, int level, int optname, int sock_no_setsockopt(struct socket *sock, int level, int optname,
char *optval, int optlen) char __user *optval, int optlen)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
int sock_no_getsockopt(struct socket *sock, int level, int optname, int sock_no_getsockopt(struct socket *sock, int level, int optname,
char *optval, int *optlen) char __user *optval, int __user *optlen)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment