selftests/seccomp: fix build on older kernels
Subsystems (2)
PATCH 1/1 selftests/seccomp: fix build on older kernels
The seccomp selftest goes to some length to build against older kernel headers, viz. all the #ifdefs at the beginning of the file. 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request") introduces some additional macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:
gcc -Wl,-no-as-needed -Wall seccomp_bpf.c -lpthread -o seccomp_bpf
In file included from seccomp_bpf.c:51:seccomp_bpf.c: In function ‘tracer_ptrace’:
seccomp_bpf.c:1787:20: error: ‘PTRACE_EVENTMSG_SYSCALL_ENTRY’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_CLONE’?
EXPECT_EQ(entry ? PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’
__typeof__(_expected) __exp = (_expected); \
^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ? PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1787:20: note: each undeclared identifier is reported only once for each function it appears in
EXPECT_EQ(entry ? PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’
__typeof__(_expected) __exp = (_expected); \
^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ? PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1788:6: error: ‘PTRACE_EVENTMSG_SYSCALL_EXIT’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_EXIT’?
: PTRACE_EVENTMSG_SYSCALL_EXIT, msg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’
__typeof__(_expected) __exp = (_expected); \
^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ? PTRACE_EVENTMSG_SYSCALL_ENTRY ^~~~~~~~~
make: *** [Makefile:12: seccomp_bpf] Error 1
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/testing/selftests/seccomp/seccomp_bpf.c +5 -0
@@ -199,6 +199,11 @@ struct seccomp_notif_sizes { };#endif +#ifndef PTRACE_EVENTMSG_SYSCALL_ENTRY +#define PTRACE_EVENTMSG_SYSCALL_ENTRY 1 +#define PTRACE_EVENTMSG_SYSCALL_EXIT 2 +#endif +#ifndef seccompint seccomp (unsigned int op,unsigned int flags,void *args) {
Signature · 1 line
2.20.1
Quoted 33 lines · Tycho Andersen
The seccomp selftest goes to some length to build against older kernel headers, viz. all the #ifdefs at the beginning of the file.
201766a20e30("ptrace: addPTRACE_GET_SYSCALL_INFOrequest") introduces some additional macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:gcc -Wl,-no-as-needed -Wall
seccomp_bpf.c-lpthread -oseccomp_bpf
In file included from seccomp_bpf.c:51:seccomp_bpf.c: In function ‘tracer_ptrace’:
seccomp_bpf.c:1787:20: error: ‘PTRACE_EVENTMSG_SYSCALL_ENTRY’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_CLONE’?
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’ __typeof__(_expected) __exp = (_expected); \ ^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1787:20: note: each undeclared identifier is reported only once for each function it appears in
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’ __typeof__(_expected) __exp = (_expected); \ ^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1788:6: error: ‘PTRACE_EVENTMSG_SYSCALL_EXIT’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_EXIT’?: PTRACE_EVENTMSG_SYSCALL_EXIT, msg); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’ __typeof__(_expected) __exp = (_expected); \ ^~~~~~~~~
Quoted 7 lines
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~
make: *** [Makefile:12:seccomp_bpf] Error 1Signed-off-by Tycho Andersen <[email protected]>Fixes 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")
Alakesh Haloi also sent a fix[1] for this. I prefer Tycho's solution (one #ifndef and a Fixes line). Shuah, can you please apply this?
Thanks!
-Kees
[1] https://lore.kernel.org/lkml/20190822215823.GA11292@ip-172-31-44-144.us-west-2.compute.internal
Quoted 23 lines
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 5 +++++ 1 file changed, 5 insertions(+)tools/testing/selftests/seccomp/seccomp_bpf.c +5
-0@@ -199,6 +199,11 @@ struct seccomp_notif_sizes { };#endif +#ifndef PTRACE_EVENTMSG_SYSCALL_ENTRY +#define PTRACE_EVENTMSG_SYSCALL_ENTRY 1 +#define PTRACE_EVENTMSG_SYSCALL_EXIT 2 +#endif +#ifndef seccompint seccomp (unsigned int op,unsigned int flags,void *args) {Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
shuah
maintainerQuoted 39 lines · Kees Cook
Quoted 38 lines · Tycho Andersen
The seccomp selftest goes to some length to build against older kernel headers, viz. all the #ifdefs at the beginning of the file.
201766a20e30("ptrace: addPTRACE_GET_SYSCALL_INFOrequest") introduces some additional macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:gcc -Wl,-no-as-needed -Wall
seccomp_bpf.c-lpthread -oseccomp_bpf
In file included from seccomp_bpf.c:51:seccomp_bpf.c: In function ‘tracer_ptrace’:
seccomp_bpf.c:1787:20: error: ‘PTRACE_EVENTMSG_SYSCALL_ENTRY’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_CLONE’?
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’ __typeof__(_expected) __exp = (_expected); \ ^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1787:20: note: each undeclared identifier is reported only once for each function it appears in
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’ __typeof__(_expected) __exp = (_expected); \ ^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1788:6: error: ‘PTRACE_EVENTMSG_SYSCALL_EXIT’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_EXIT’?: PTRACE_EVENTMSG_SYSCALL_EXIT, msg); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’ __typeof__(_expected) __exp = (_expected); \ ^~~~~~~~~seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~
make: *** [Makefile:12:seccomp_bpf] Error 1
Quoted 8 lines
Quoted 2 lines
Signed-off-by Tycho Andersen <[email protected]>Fixes 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")Acked-by Kees Cook <[email protected]>Alakesh Haloi also sent a fix[1] for this. I prefer Tycho's solution (one #ifndef and a Fixes line). Shuah, can you please apply this?
Kees,
Yes I will pick this up.
thanks,
-- Shuah
shuah
maintainerQuoted 49 lines · shuah
Quoted 39 lines · Kees Cook
Quoted 38 lines · Tycho Andersen
The seccomp selftest goes to some length to build against older kernel headers, viz. all the #ifdefs at the beginning of the file.
201766a20e30("ptrace: addPTRACE_GET_SYSCALL_INFOrequest") introduces some additional macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:gcc -Wl,-no-as-needed -Wall
seccomp_bpf.c-lpthread -oseccomp_bpf
In file included from seccomp_bpf.c:51:seccomp_bpf.c: In function ‘tracer_ptrace’:
seccomp_bpf.c:1787:20: error: ‘PTRACE_EVENTMSG_SYSCALL_ENTRY’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_CLONE’? EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’
__typeof__(_expected)__exp= (_expected); \
^~~~~~~~~
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1787:20: note: each undeclared identifier is reported only once for each function it appears in EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’
__typeof__(_expected)__exp= (_expected); \
^~~~~~~~~
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
seccomp_bpf.c:1788:6: error: ‘PTRACE_EVENTMSG_SYSCALL_EXIT’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_EXIT’? :PTRACE_EVENTMSG_SYSCALL_EXIT, msg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’
__typeof__(_expected)__exp= (_expected); \
^~~~~~~~~
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY
^~~~~~~~~
make: *** [Makefile:12:seccomp_bpf] Error 1Quoted 8 lines
Quoted 2 lines
Signed-off-by Tycho Andersen <[email protected]>Fixes 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")Acked-by Kees Cook <[email protected]>Alakesh Haloi also sent a fix[1] for this. I prefer Tycho's solution (one #ifndef and a Fixes line). Shuah, can you please apply this?
Quoted 7 lines
Kees,
Yes I will pick this up.
thanks,
-- Shuah
Applied after fixing the following checkpatch error in the commit log:
ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")' #82:
Now reads as follows:
Commit 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")
introduces some additional macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:
thanks,
-- Shuah
Quoted 71 lines · shuah
Quoted 55 lines · shuah
Quoted 45 lines · Kees Cook
Quoted 44 lines · Tycho Andersen
The seccomp selftest goes to some length to build against older kernel headers, viz. all the #ifdefs at the beginning of the file.
201766a20e30("ptrace: addPTRACE_GET_SYSCALL_INFOrequest") introduces some additional
macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:gcc -Wl,-no-as-needed -Wall
seccomp_bpf.c-lpthread -oseccomp_bpfIn file included from seccomp_bpf.c:51:seccomp_bpf.c: In function ‘tracer_ptrace’:
seccomp_bpf.c:1787:20: error: ‘PTRACE_EVENTMSG_SYSCALL_ENTRY’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_CLONE’?
EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~~~~~~~~~~~~~~~~~~~~~../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’__typeof__(_expected)__exp= (_expected); \
^~~~~~~~~
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’ EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~
seccomp_bpf.c:1787:20: note: each undeclared identifier is reported only once for each function it appears in EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~~~~~~~~~~~~~~~~~~~~~../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’__typeof__(_expected)__exp= (_expected); \
^~~~~~~~~
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’ EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~
seccomp_bpf.c:1788:6: error: ‘PTRACE_EVENTMSG_SYSCALL_EXIT’ undeclared (first use in this function); did you mean ‘PTRACE_EVENT_EXIT’?
:PTRACE_EVENTMSG_SYSCALL_EXIT, msg); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~../kselftest_harness.h:608:13: note: in definition of macro ‘__EXPECT’__typeof__(_expected)__exp= (_expected); \
^~~~~~~~~
seccomp_bpf.c:1787:2: note: in expansion of macro ‘EXPECT_EQ’ EXPECT_EQ(entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY^~~~~~~~~
make: *** [Makefile:12:seccomp_bpf] Error 1Quoted 8 lines
Quoted 2 lines
Signed-off-by Tycho Andersen <[email protected]>Fixes 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")Acked-by Kees Cook <[email protected]>Alakesh Haloi also sent a fix[1] for this. I prefer Tycho's solution (one #ifndef and a Fixes line). Shuah, can you please apply this?
Quoted 7 lines
Kees,
Yes I will pick this up.
thanks,
-- ShuahApplied after fixing the following checkpatch error in the commit log:
ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit
201766a20e30("ptrace: addPTRACE_GET_SYSCALL_INFOrequest")'
#82:
Quoted 5 lines
Now reads as follows:
Commit
201766a20e30("ptrace: addPTRACE_GET_SYSCALL_INFOrequest")
introduces some additional macros, but doesn't do the #ifdef dance. Let's add that dance here to avoid:
Ah, good to know. Thanks!
Tycho