summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-23 09:08:47 +0300
committerDavid S. Miller <davem@davemloft.net>2020-07-25 01:41:53 +0300
commitb1ea9ff6aff2deae84eccaf0a07cd14912669680 (patch)
tree1b4e6db9c617a49ab90bb26dcd3e3cbeb946f5ec /net/core
parentba423fdaa589d972473083defedf9e862626d268 (diff)
downloadlinux-b1ea9ff6aff2deae84eccaf0a07cd14912669680.tar.xz
net: switch copy_bpf_fprog_from_user to sockptr_t
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/filter.c6
-rw-r--r--net/core/sock.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 3fa16b8c0d61..29e3455122f7 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -77,14 +77,14 @@
#include <net/transp_v6.h>
#include <linux/btf_ids.h>
-int copy_bpf_fprog_from_user(struct sock_fprog *dst, void __user *src, int len)
+int copy_bpf_fprog_from_user(struct sock_fprog *dst, sockptr_t src, int len)
{
if (in_compat_syscall()) {
struct compat_sock_fprog f32;
if (len != sizeof(f32))
return -EINVAL;
- if (copy_from_user(&f32, src, sizeof(f32)))
+ if (copy_from_sockptr(&f32, src, sizeof(f32)))
return -EFAULT;
memset(dst, 0, sizeof(*dst));
dst->len = f32.len;
@@ -92,7 +92,7 @@ int copy_bpf_fprog_from_user(struct sock_fprog *dst, void __user *src, int len)
} else {
if (len != sizeof(*dst))
return -EINVAL;
- if (copy_from_user(dst, src, sizeof(*dst)))
+ if (copy_from_sockptr(dst, src, sizeof(*dst)))
return -EFAULT;
}
diff --git a/net/core/sock.c b/net/core/sock.c
index 6da54eac2b34..71fc7e4ddd06 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1063,7 +1063,8 @@ set_sndbuf:
case SO_ATTACH_FILTER: {
struct sock_fprog fprog;
- ret = copy_bpf_fprog_from_user(&fprog, optval, optlen);
+ ret = copy_bpf_fprog_from_user(&fprog, USER_SOCKPTR(optval),
+ optlen);
if (!ret)
ret = sk_attach_filter(&fprog, sk);
break;
@@ -1084,7 +1085,8 @@ set_sndbuf:
case SO_ATTACH_REUSEPORT_CBPF: {
struct sock_fprog fprog;
- ret = copy_bpf_fprog_from_user(&fprog, optval, optlen);
+ ret = copy_bpf_fprog_from_user(&fprog, USER_SOCKPTR(optval),
+ optlen);
if (!ret)
ret = sk_reuseport_attach_filter(&fprog, sk);
break;