Commit b1ea9ff6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba423fda

include/linux/filter.h

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kallsyms.h>

#include <linux/if_vlan.h>

#include <linux/vmalloc.h>

#include <linux/sockptr.h>

#include <crypto/sha.h>



#include <net/sch_generic.h>
@@ -1276,7 +1277,7 @@ struct bpf_sockopt_kern { 
	s32		retval;

};



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);



struct bpf_sk_lookup_kern {

	u16		family;

net/core/filter.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

net/core/sock.c

+4 −2
Original line number Diff line number Diff line
@@ -1063,7 +1063,8 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
	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 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
	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;

net/packet/af_packet.c

+2 −2
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ static void __fanout_set_data_bpf(struct packet_fanout *f, struct bpf_prog *new) 
	}

}



static int fanout_set_data_cbpf(struct packet_sock *po, char __user *data,

static int fanout_set_data_cbpf(struct packet_sock *po, sockptr_t data,

				unsigned int len)

{

	struct bpf_prog *new;
@@ -1584,7 +1584,7 @@ static int fanout_set_data(struct packet_sock *po, char __user *data, 
{

	switch (po->fanout->type) {

	case PACKET_FANOUT_CBPF:

		return fanout_set_data_cbpf(po, data, len);

		return fanout_set_data_cbpf(po, USER_SOCKPTR(data), len);

	case PACKET_FANOUT_EBPF:

		return fanout_set_data_ebpf(po, data, len);

	default: