GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: switch sock_set_timeout to sockptr_t

Browse source 
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-07-23 08:08:50 +02:00 • committed by David S. Miller
parent c34645ac25
commit c8c1bbb6eb
4 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/net/sock.h
View file

@ -59,6 +59,7 @@
#include <linux/filter.h> #include <linux/filter.h>
#include <linux/rculist_nulls.h> #include <linux/rculist_nulls.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/sockptr.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/refcount.h> #include <linux/refcount.h>
@ -1669,7 +1670,7 @@ void sock_pfree(struct sk_buff *skb);
#endif #endif
int sock_setsockopt(struct socket *sock, int level, int op, int sock_setsockopt(struct socket *sock, int level, int op,
char __user *optval, unsigned int optlen); sockptr_t optval, unsigned int optlen);
int sock_getsockopt(struct socket *sock, int level, int op, int sock_getsockopt(struct socket *sock, int level, int op,
char __user *optval, int __user *optlen); char __user *optval, int __user *optlen);

26
net/core/sock.c
View file

@ -826,7 +826,7 @@ EXPORT_SYMBOL(sock_set_rcvbuf);
*/ */
int sock_setsockopt(struct socket *sock, int level, int optname, int sock_setsockopt(struct socket *sock, int level, int optname,
char __user *optval, unsigned int optlen) sockptr_t optval, unsigned int optlen)
{ {
struct sock_txtime sk_txtime; struct sock_txtime sk_txtime;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
@ -840,12 +840,12 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
*/ */
if (optname == SO_BINDTODEVICE) if (optname == SO_BINDTODEVICE)
return sock_setbindtodevice(sk, USER_SOCKPTR(optval), optlen); return sock_setbindtodevice(sk, optval, optlen);
if (optlen < sizeof(int)) if (optlen < sizeof(int))
return -EINVAL; return -EINVAL;
if (get_user(val, (int __user *)optval)) if (copy_from_sockptr(&val, optval, sizeof(val)))
return -EFAULT; return -EFAULT;
valbool = val ? 1 : 0; valbool = val ? 1 : 0;
@ -958,7 +958,7 @@ set_sndbuf:
ret = -EINVAL; /* 1003.1g */ ret = -EINVAL; /* 1003.1g */
break; break;
} }
if (copy_from_user(&ling, optval, sizeof(ling))) { if (copy_from_sockptr(&ling, optval, sizeof(ling))) {
ret = -EFAULT; ret = -EFAULT;
break; break;
} }
@ -1052,21 +1052,20 @@ set_sndbuf:
case SO_RCVTIMEO_OLD: case SO_RCVTIMEO_OLD:
case SO_RCVTIMEO_NEW: case SO_RCVTIMEO_NEW:
ret = sock_set_timeout(&sk->sk_rcvtimeo, USER_SOCKPTR(optval), ret = sock_set_timeout(&sk->sk_rcvtimeo, optval,
optlen, optname == SO_RCVTIMEO_OLD); optlen, optname == SO_RCVTIMEO_OLD);
break; break;
case SO_SNDTIMEO_OLD: case SO_SNDTIMEO_OLD:
case SO_SNDTIMEO_NEW: case SO_SNDTIMEO_NEW:
ret = sock_set_timeout(&sk->sk_sndtimeo, USER_SOCKPTR(optval), ret = sock_set_timeout(&sk->sk_sndtimeo, optval,
optlen, optname == SO_SNDTIMEO_OLD); optlen, optname == SO_SNDTIMEO_OLD);
break; break;
case SO_ATTACH_FILTER: { case SO_ATTACH_FILTER: {
struct sock_fprog fprog; struct sock_fprog fprog;
ret = copy_bpf_fprog_from_user(&fprog, USER_SOCKPTR(optval), ret = copy_bpf_fprog_from_user(&fprog, optval, optlen);
optlen);
if (!ret) if (!ret)
ret = sk_attach_filter(&fprog, sk); ret = sk_attach_filter(&fprog, sk);
break; break;
@ -1077,7 +1076,7 @@ set_sndbuf:
u32 ufd; u32 ufd;
ret = -EFAULT; ret = -EFAULT;
if (copy_from_user(&ufd, optval, sizeof(ufd))) if (copy_from_sockptr(&ufd, optval, sizeof(ufd)))
break; break;
ret = sk_attach_bpf(ufd, sk); ret = sk_attach_bpf(ufd, sk);
@ -1087,8 +1086,7 @@ set_sndbuf:
case SO_ATTACH_REUSEPORT_CBPF: { case SO_ATTACH_REUSEPORT_CBPF: {
struct sock_fprog fprog; struct sock_fprog fprog;
ret = copy_bpf_fprog_from_user(&fprog, USER_SOCKPTR(optval), ret = copy_bpf_fprog_from_user(&fprog, optval, optlen);
optlen);
if (!ret) if (!ret)
ret = sk_reuseport_attach_filter(&fprog, sk); ret = sk_reuseport_attach_filter(&fprog, sk);
break; break;
@ -1099,7 +1097,7 @@ set_sndbuf:
u32 ufd; u32 ufd;
ret = -EFAULT; ret = -EFAULT;
if (copy_from_user(&ufd, optval, sizeof(ufd))) if (copy_from_sockptr(&ufd, optval, sizeof(ufd)))
break; break;
ret = sk_reuseport_attach_bpf(ufd, sk); ret = sk_reuseport_attach_bpf(ufd, sk);
@ -1179,7 +1177,7 @@ set_sndbuf:
if (sizeof(ulval) != sizeof(val) && if (sizeof(ulval) != sizeof(val) &&
optlen >= sizeof(ulval) && optlen >= sizeof(ulval) &&
get_user(ulval, (unsigned long __user *)optval)) { copy_from_sockptr(&ulval, optval, sizeof(ulval))) {
ret = -EFAULT; ret = -EFAULT;
break; break;
} }
@ -1222,7 +1220,7 @@ set_sndbuf:
if (optlen != sizeof(struct sock_txtime)) { if (optlen != sizeof(struct sock_txtime)) {
ret = -EINVAL; ret = -EINVAL;
break; break;
} else if (copy_from_user(&sk_txtime, optval, } else if (copy_from_sockptr(&sk_txtime, optval,
sizeof(struct sock_txtime))) { sizeof(struct sock_txtime))) {
ret = -EFAULT; ret = -EFAULT;
break; break;

6
net/mptcp/protocol.c
View file

@ -1648,7 +1648,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
return -EINVAL; return -EINVAL;
} }
ret = sock_setsockopt(ssock, SOL_SOCKET, optname, optval, optlen); ret = sock_setsockopt(ssock, SOL_SOCKET, optname,
USER_SOCKPTR(optval), optlen);
if (ret == 0) { if (ret == 0) {
if (optname == SO_REUSEPORT) if (optname == SO_REUSEPORT)
sk->sk_reuseport = ssock->sk->sk_reuseport; sk->sk_reuseport = ssock->sk->sk_reuseport;
@ -1659,7 +1660,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
return ret; return ret;
} }
return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen); return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname,
USER_SOCKPTR(optval), optlen);
} }
static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname, static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname,

3
net/socket.c
View file

@ -2130,7 +2130,8 @@ int __sys_setsockopt(int fd, int level, int optname, char __user *optval,
} }
if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock)) if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock))
err = sock_setsockopt(sock, level, optname, optval, optlen); err = sock_setsockopt(sock, level, optname,
USER_SOCKPTR(optval), optlen);
else if (unlikely(!sock->ops->setsockopt)) else if (unlikely(!sock->ops->setsockopt))
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
else else