From: James Morris <jmorris@namei.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-security-module@vger.kernel.org,
Ingo Molnar <mingo@elte.hu>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, Kees Cook <keescook@chromium.org>
Subject: [GIT PULL] seccomp: build fix for v5.0-rc2
Date: Wed, 9 Jan 2019 08:04:38 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LRH.2.21.1901090803120.24546@namei.org> (raw)
Please pull this fix for a build regression in seccomp.
The following changes since commit 7b55851367136b1efd84d98fea81ba57a98304cf:
fork: record start_time late (2019-01-08 09:40:53 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git fixes-v5.0-rc1
for you to fetch changes up to cba54b44d0be4eb66dbc7709e1f3f0d65e851f69:
samples/seccomp: fix 32-bit build (2019-01-08 13:00:00 -0800)
----------------------------------------------------------------
Tycho Andersen (1):
samples/seccomp: fix 32-bit build
samples/seccomp/Makefile | 1 +
1 file changed, 1 insertion(+)
---
commit cba54b44d0be4eb66dbc7709e1f3f0d65e851f69
Author: Tycho Andersen <tycho@tycho.ws>
Date: Mon Jan 7 14:46:34 2019 -0700
samples/seccomp: fix 32-bit build
Both the .o and the actual executable need to be built with -m32 in order
to link correctly.
Fixes: fec7b6690541 ("samples: add an example of seccomp user trap")
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: James Morris <james.morris@microsoft.com>
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
index 4920903c8009..a5607668a5c7 100644
--- a/samples/seccomp/Makefile
+++ b/samples/seccomp/Makefile
@@ -37,6 +37,7 @@ HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
HOSTLDLIBS_bpf-direct += $(MFLAG)
HOSTLDLIBS_bpf-fancy += $(MFLAG)
HOSTLDLIBS_dropper += $(MFLAG)
+HOSTLDLIBS_user-trap.o += $(MFLAG)
HOSTLDLIBS_user-trap += $(MFLAG)
endif
always := $(hostprogs-m)
next reply other threads:[~2019-01-08 21:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 21:04 James Morris [this message]
2019-01-08 21:11 ` Kees Cook
2019-01-09 6:59 ` Ingo Molnar
2019-01-10 3:18 ` Tycho Andersen
2019-01-11 7:09 ` Ingo Molnar
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=alpine.LRH.2.21.1901090803120.24546@namei.org \
--to=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®