-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Alexei Starovoitov says: ==================== pull-request: bpf 2022-02-17 We've added 8 non-merge commits during the last 7 day(s) which contain a total of 8 files changed, 119 insertions(+), 15 deletions(-). The main changes are: 1) Add schedule points in map batch ops, from Eric. 2) Fix bpf_msg_push_data with len 0, from Felix. 3) Fix crash due to incorrect copy_map_value, from Kumar. 4) Fix crash due to out of bounds access into reg2btf_ids, from Kumar. 5) Fix a bpf_timer initialization issue with clang, from Yonghong. * https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: bpf: Add schedule points in batch ops bpf: Fix crash due to out of bounds access into reg2btf_ids. selftests: bpf: Check bpf_msg_push_data return value bpf: Fix a bpf_timer initialization issue bpf: Emit bpf_timer in vmlinux BTF selftests/bpf: Add test for bpf_timer overwriting crash bpf: Fix crash due to incorrect copy_map_value bpf: Do not try bpf_msg_push_data with len 0 ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
- Loading branch information
Showing
8 changed files
with
119 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| #include <test_progs.h> | ||
| #include "timer_crash.skel.h" | ||
|
|
||
| enum { | ||
| MODE_ARRAY, | ||
| MODE_HASH, | ||
| }; | ||
|
|
||
| static void test_timer_crash_mode(int mode) | ||
| { | ||
| struct timer_crash *skel; | ||
|
|
||
| skel = timer_crash__open_and_load(); | ||
| if (!ASSERT_OK_PTR(skel, "timer_crash__open_and_load")) | ||
| return; | ||
| skel->bss->pid = getpid(); | ||
| skel->bss->crash_map = mode; | ||
| if (!ASSERT_OK(timer_crash__attach(skel), "timer_crash__attach")) | ||
| goto end; | ||
| usleep(1); | ||
| end: | ||
| timer_crash__destroy(skel); | ||
| } | ||
|
|
||
| void test_timer_crash(void) | ||
| { | ||
| if (test__start_subtest("array")) | ||
| test_timer_crash_mode(MODE_ARRAY); | ||
| if (test__start_subtest("hash")) | ||
| test_timer_crash_mode(MODE_HASH); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
|
|
||
| #include <vmlinux.h> | ||
| #include <bpf/bpf_tracing.h> | ||
| #include <bpf/bpf_helpers.h> | ||
|
|
||
| struct map_elem { | ||
| struct bpf_timer timer; | ||
| struct bpf_spin_lock lock; | ||
| }; | ||
|
|
||
| struct { | ||
| __uint(type, BPF_MAP_TYPE_ARRAY); | ||
| __uint(max_entries, 1); | ||
| __type(key, int); | ||
| __type(value, struct map_elem); | ||
| } amap SEC(".maps"); | ||
|
|
||
| struct { | ||
| __uint(type, BPF_MAP_TYPE_HASH); | ||
| __uint(max_entries, 1); | ||
| __type(key, int); | ||
| __type(value, struct map_elem); | ||
| } hmap SEC(".maps"); | ||
|
|
||
| int pid = 0; | ||
| int crash_map = 0; /* 0 for amap, 1 for hmap */ | ||
|
|
||
| SEC("fentry/do_nanosleep") | ||
| int sys_enter(void *ctx) | ||
| { | ||
| struct map_elem *e, value = {}; | ||
| void *map = crash_map ? (void *)&hmap : (void *)&amap; | ||
|
|
||
| if (bpf_get_current_task_btf()->tgid != pid) | ||
| return 0; | ||
|
|
||
| *(void **)&value = (void *)0xdeadcaf3; | ||
|
|
||
| bpf_map_update_elem(map, &(int){0}, &value, 0); | ||
| /* For array map, doing bpf_map_update_elem will do a | ||
| * check_and_free_timer_in_array, which will trigger the crash if timer | ||
| * pointer was overwritten, for hmap we need to use bpf_timer_cancel. | ||
| */ | ||
| if (crash_map == 1) { | ||
| e = bpf_map_lookup_elem(map, &(int){0}); | ||
| if (!e) | ||
| return 0; | ||
| bpf_timer_cancel(&e->timer); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| char _license[] SEC("license") = "GPL"; |