diff options
| author | Linus Torvalds | 2022-08-02 14:34:03 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-08-02 14:34:03 -0700 |
| commit | 9a8ac9ee07d445d81963756f0b18af4f06692258 (patch) | |
| tree | 4e20c6d53ea3786d9f1335cbd963a5dfbfad2a44 /tools | |
| parent | ddd1949f585ef98138754033c9b1251ca2d32951 (diff) | |
| parent | 3ce4b78f73e8e00fb86bad67ee7f6fe12019707e (diff) | |
Merge tag 'seccomp-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp update from Kees Cook:
- Fix Clang build warning (YiFei Zhu)
* tag 'seccomp-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
selftests/seccomp: Fix compile warning when CC=clang
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/seccomp/seccomp_bpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index 136df5b76319..4ae6c8991307 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -809,7 +809,7 @@ void kill_thread_or_group(struct __test_metadata *_metadata, .len = (unsigned short)ARRAY_SIZE(filter_thread), .filter = filter_thread, }; - int kill = kill_how == KILL_PROCESS ? SECCOMP_RET_KILL_PROCESS : 0xAAAAAAAAA; + int kill = kill_how == KILL_PROCESS ? SECCOMP_RET_KILL_PROCESS : 0xAAAAAAAA; struct sock_filter filter_process[] = { BPF_STMT(BPF_LD|BPF_W|BPF_ABS, offsetof(struct seccomp_data, nr)), |