Commit db5b6a46 authored by Qing Wang's avatar Qing Wang Committed by Alexei Starovoitov
Browse files

net: bpf: Switch over to memdup_user() 



This patch fixes the following Coccinelle warning:

net/bpf/test_run.c:361:8-15: WARNING opportunity for memdup_user
net/bpf/test_run.c:1055:8-15: WARNING opportunity for memdup_user

Use memdup_user rather than duplicating its implementation
This is a little bit restricted to reduce false positives

Signed-off-by: default avatarQing Wang <wangqing@vivo.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/1634556651-38702-1-git-send-email-wangqing@vivo.com
parent 7960d02d

net/bpf/test_run.c

+6 −15
Original line number Diff line number Diff line
@@ -358,13 +358,9 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, 
		return -EINVAL;



	if (ctx_size_in) {

		info.ctx = kzalloc(ctx_size_in, GFP_USER);

		if (!info.ctx)

			return -ENOMEM;

		if (copy_from_user(info.ctx, ctx_in, ctx_size_in)) {

			err = -EFAULT;

			goto out;

		}

		info.ctx = memdup_user(ctx_in, ctx_size_in);

		if (IS_ERR(info.ctx))

			return PTR_ERR(info.ctx);

	} else {

		info.ctx = NULL;

	}
@@ -392,7 +388,6 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, 
	    copy_to_user(&uattr->test.retval, &info.retval, sizeof(u32)))

		err = -EFAULT;



out:

	kfree(info.ctx);

	return err;

}
@@ -1052,13 +1047,9 @@ int bpf_prog_test_run_syscall(struct bpf_prog *prog, 
		return -EINVAL;



	if (ctx_size_in) {

		ctx = kzalloc(ctx_size_in, GFP_USER);

		if (!ctx)

			return -ENOMEM;

		if (copy_from_user(ctx, ctx_in, ctx_size_in)) {

			err = -EFAULT;

			goto out;

		}

		ctx = memdup_user(ctx_in, ctx_size_in);

		if (IS_ERR(ctx))

			return PTR_ERR(ctx);

	}



	rcu_read_lock_trace();