Commit 9a8ac9ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ddd1949f 3ce4b78f

tools/testing/selftests/seccomp/seccomp_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -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)),