linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tycho Andersen <tycho@tycho.ws>
To: shuah <shuah@kernel.org>
Cc: Kees Cook <keescook@chromium.org>,
	linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alakesh Haloi <alakesh.haloi@gmail.com>
Subject: Re: [PATCH] selftests/seccomp: fix build on older kernels
Date: Fri, 30 Aug 2019 09:31:35 -0600	[thread overview]
Message-ID: <20190830153135.GD7627@cisco> (raw)
In-Reply-To: <1a3e9d47-73f5-9cf5-e050-46a455b6a6cc@kernel.org>

On Fri, Aug 30, 2019 at 09:19:00AM -0600, shuah wrote:
> On 8/29/19 6:45 PM, shuah wrote:
> > On 8/29/19 11:06 AM, Kees Cook wrote:
> > > On Mon, Aug 26, 2019 at 08:43:02AM -0600, Tycho Andersen wrote:
> > > > 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
> > > > 
> > > > Signed-off-by: Tycho Andersen <tycho@tycho.ws>
> > > > Fixes: 201766a20e30 ("ptrace: add PTRACE_GET_SYSCALL_INFO request")
> > > 
> > > Acked-by: Kees Cook <keescook@chromium.org>
> > > 
> > > 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
> > 
> 
> 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:

Ah, good to know. Thanks!

Tycho

      reply	other threads:[~2019-08-30 15:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-26 14:43 [PATCH] selftests/seccomp: fix build on older kernels Tycho Andersen
2019-08-29 17:06 ` Kees Cook
2019-08-30  0:45   ` shuah
2019-08-30 15:19     ` shuah
2019-08-30 15:31       ` Tycho Andersen [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190830153135.GD7627@cisco \
    --to=tycho@tycho.ws \
    --cc=alakesh.haloi@gmail.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).