diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-20 23:16:11 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-20 23:16:11 +0300 |
| commit | 0fe2f273ab892bbba3f8d85e3f237bc0802e5709 (patch) | |
| tree | c0194aaa4d716cd49909176885bf498dd6de8cd4 /net/bpf | |
| parent | 7b8fc0103bb51d1d3e1fb5fd67958612e709f883 (diff) | |
| parent | 75439bc439e0f02903b48efce84876ca92da97bd (diff) | |
| download | linux-0fe2f273ab892bbba3f8d85e3f237bc0802e5709.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/can/dev.c
commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug")
commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")
Code move.
drivers/net/dsa/b53/b53_common.c
commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")
Field rename.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/bpf')
| -rw-r--r-- | net/bpf/test_run.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 23dfb2010ba6..58bcb8c849d5 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -272,7 +272,8 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, kattr->test.repeat) return -EINVAL; - if (ctx_size_in < prog->aux->max_ctx_offset) + if (ctx_size_in < prog->aux->max_ctx_offset || + ctx_size_in > MAX_BPF_FUNC_ARGS * sizeof(u64)) return -EINVAL; if ((kattr->test.flags & BPF_F_TEST_RUN_ON_CPU) == 0 && cpu != 0) |