Commit d800bad6 authored May 18, 2020 by Jesper Dangaard Brouer Committed by Daniel Borkmann May 19, 2020

bpf: Fix too large copy from user in bpf_test_init

Commit bc56c919 ("bpf: Add xdp.frame_sz in bpf_prog_test_run_xdp().")
recently changed bpf_prog_test_run_xdp() to use larger frames for XDP in
order to test tail growing frames (via bpf_xdp_adjust_tail) and to have
memory backing frame better resemble drivers.

The commit contains a bug, as it tries to copy the max data size from
userspace, instead of the size provided by userspace. This cause XDP
unit tests to fail sporadically with EFAULT, an unfortunate behavior.
The fix is to only copy the size specified by userspace.

Fixes: bc56c919 ("bpf: Add xdp.frame_sz in bpf_prog_test_run_xdp().")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/158980712729.256597.6115007718472928659.stgit@firesoul

parent 59929cd1

net/bpf/test_run.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -160,16 +160,20 @@ static void bpf_test_init(const union bpf_attr kattr, u32 size,
		u32 headroom, u32 tailroom)
		{
		void __user *data_in = u64_to_user_ptr(kattr->test.data_in);
		u32 user_size = kattr->test.data_size_in;
		void *data;

		if (size < ETH_HLEN \|\| size > PAGE_SIZE - headroom - tailroom)
		return ERR_PTR(-EINVAL);

		if (user_size > size)
		return ERR_PTR(-EMSGSIZE);

		data = kzalloc(size + headroom + tailroom, GFP_USER);
		if (!data)
		return ERR_PTR(-ENOMEM);

		if (copy_from_user(data + headroom, data_in, size)) {
		if (copy_from_user(data + headroom, data_in, user_size)) {
		kfree(data);
		return ERR_PTR(-EFAULT);
		}
		@@ -486,8 +490,6 @@ int bpf_prog_test_run_xdp(struct bpf_prog prog, const union bpf_attr kattr,

		/* XDP have extra tailroom as (most) drivers use full page */
		max_data_sz = 4096 - headroom - tailroom;
		if (size > max_data_sz)
		return -EINVAL;

		data = bpf_test_init(kattr, max_data_sz, headroom, tailroom);
		if (IS_ERR(data))

Admin message