Commit b1fcd35c authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: filter: let unattached filters use sock_fprog_kern 



The sk_unattached_filter_create() API is used by BPF filters that
are not directly attached or related to sockets, and are used in
team, ptp, xt_bpf, cls_bpf, etc. As such all users do their own
internal managment of obtaining filter blocks and thus already
have them in kernel memory and set up before calling into
sk_unattached_filter_create(). As a result, due to __user annotation
in sock_fprog, sparse triggers false positives (incorrect type in
assignment [different address space]) when filters are set up before
passing them to sk_unattached_filter_create(). Therefore, let
sk_unattached_filter_create() API use sock_fprog_kern to overcome
this issue.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Acked-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8556ce79

drivers/isdn/i4l/isdn_ppp.c

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) 
#ifdef CONFIG_IPPP_FILTER

	case PPPIOCSPASS:

	{

		struct sock_fprog fprog;

		struct sock_fprog_kern fprog;

		struct sock_filter *code;

		int err, len = get_filter(argp, &code);
@@ -653,7 +653,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) 
	}

	case PPPIOCSACTIVE:

	{

		struct sock_fprog fprog;

		struct sock_fprog_kern fprog;

		struct sock_filter *code;

		int err, len = get_filter(argp, &code);

drivers/net/ppp/ppp_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


		err = get_filter(argp, &code);

		if (err >= 0) {

			struct sock_fprog fprog = {

			struct sock_fprog_kern fprog = {

				.len = err,

				.filter = code,

			};
@@ -778,7 +778,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


		err = get_filter(argp, &code);

		if (err >= 0) {

			struct sock_fprog fprog = {

			struct sock_fprog_kern fprog = {

				.len = err,

				.filter = code,

			};

drivers/net/team/team_mode_loadbalance.c

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct lb_port_mapping { 
struct lb_priv_ex {

	struct team *team;

	struct lb_port_mapping tx_hash_to_port_mapping[LB_TX_HASHTABLE_SIZE];

	struct sock_fprog *orig_fprog;

	struct sock_fprog_kern *orig_fprog;

	struct {

		unsigned int refresh_interval; /* in tenths of second */

		struct delayed_work refresh_dw;
@@ -241,10 +241,10 @@ static int lb_bpf_func_get(struct team *team, struct team_gsetter_ctx *ctx) 
	return 0;

}



static int __fprog_create(struct sock_fprog **pfprog, u32 data_len,

static int __fprog_create(struct sock_fprog_kern **pfprog, u32 data_len,

			  const void *data)

{

	struct sock_fprog *fprog;

	struct sock_fprog_kern *fprog;

	struct sock_filter *filter = (struct sock_filter *) data;



	if (data_len % sizeof(struct sock_filter))
@@ -262,7 +262,7 @@ static int __fprog_create(struct sock_fprog **pfprog, u32 data_len, 
	return 0;

}



static void __fprog_destroy(struct sock_fprog *fprog)

static void __fprog_destroy(struct sock_fprog_kern *fprog)

{

	kfree(fprog->filter);

	kfree(fprog);
@@ -273,7 +273,7 @@ static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx) 
	struct lb_priv *lb_priv = get_lb_priv(team);

	struct sk_filter *fp = NULL;

	struct sk_filter *orig_fp;

	struct sock_fprog *fprog = NULL;

	struct sock_fprog_kern *fprog = NULL;

	int err;



	if (ctx->data.bin_val.len) {

include/linux/filter.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int sk_convert_filter(struct sock_filter *prog, int len, 
		      struct sock_filter_int *new_prog, int *new_len);



int sk_unattached_filter_create(struct sk_filter **pfp,

				struct sock_fprog *fprog);

				struct sock_fprog_kern *fprog);

void sk_unattached_filter_destroy(struct sk_filter *fp);



int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);

lib/test_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ static int run_one(struct sk_filter *fp, struct bpf_test *t) 
static __init int test_bpf(void)

{

	struct sk_filter *fp, *fp_ext = NULL;

	struct sock_fprog fprog;

	struct sock_fprog_kern fprog;

	int err, i, err_cnt = 0;



	for (i = 0; i < ARRAY_SIZE(tests); i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE