[PATCH] samples/seccomp: fix 32-bit build

[PATCH] samples/seccomp: fix 32-bit build

[Tycho Andersen]

Both the .o and the actual executable need to be built with -m32 in order
to link correctly.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Reported-by: Ingo Molnar <mingo@kernel.org>
Fixes: fec7b6690541 ("samples: add an example of seccomp user trap")
---
I guess x86 can pick this up directly? Not sure where it should go
exactly.
---
 samples/seccomp/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
index 4920903c8009..fb43a814d4c0 100644
--- a/samples/seccomp/Makefile
+++ b/samples/seccomp/Makefile
@@ -34,6 +34,7 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG)
 HOSTCFLAGS_dropper.o += $(MFLAG)
 HOSTCFLAGS_bpf-helper.o += $(MFLAG)
 HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
+HOSTCFLAGS_user-trap.o += $(MFLAG)
 HOSTLDLIBS_bpf-direct += $(MFLAG)
 HOSTLDLIBS_bpf-fancy += $(MFLAG)
 HOSTLDLIBS_dropper += $(MFLAG)
-- 
2.19.1

Re: [PATCH] samples/seccomp: fix 32-bit build

[Kees Cook]

On Mon, Jan 7, 2019 at 3:16 PM Tycho Andersen <tycho@tycho.ws> wrote:
>
> Both the .o and the actual executable need to be built with -m32 in order
> to link correctly.
>
> Signed-off-by: Tycho Andersen <tycho@tycho.ws>
> Reported-by: Ingo Molnar <mingo@kernel.org>
> Fixes: fec7b6690541 ("samples: add an example of seccomp user trap")

Reviewed-by: Kees Cook <keescook@chromium.org>

> ---
> I guess x86 can pick this up directly? Not sure where it should go
> exactly.

Ingo, can you snag this? (It's a more direct path, otherwise I can
take it via seccomp, which will go through my tree then James's
tree...)

-Kees

> ---
>  samples/seccomp/Makefile | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
> index 4920903c8009..fb43a814d4c0 100644
> --- a/samples/seccomp/Makefile
> +++ b/samples/seccomp/Makefile
> @@ -34,6 +34,7 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG)
>  HOSTCFLAGS_dropper.o += $(MFLAG)
>  HOSTCFLAGS_bpf-helper.o += $(MFLAG)
>  HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
> +HOSTCFLAGS_user-trap.o += $(MFLAG)
>  HOSTLDLIBS_bpf-direct += $(MFLAG)
>  HOSTLDLIBS_bpf-fancy += $(MFLAG)
>  HOSTLDLIBS_dropper += $(MFLAG)
> --
> 2.19.1
>


-- 
Kees Cook

Re: [PATCH] samples/seccomp: fix 32-bit build

[Ingo Molnar]

* Kees Cook <keescook@chromium.org> wrote:

> On Mon, Jan 7, 2019 at 3:16 PM Tycho Andersen <tycho@tycho.ws> wrote:
> >
> > Both the .o and the actual executable need to be built with -m32 in order
> > to link correctly.
> >
> > Signed-off-by: Tycho Andersen <tycho@tycho.ws>
> > Reported-by: Ingo Molnar <mingo@kernel.org>
> > Fixes: fec7b6690541 ("samples: add an example of seccomp user trap")
> 
> Reviewed-by: Kees Cook <keescook@chromium.org>
> 
> > ---
> > I guess x86 can pick this up directly? Not sure where it should go
> > exactly.
> 
> Ingo, can you snag this? (It's a more direct path, otherwise I can
> take it via seccomp, which will go through my tree then James's
> tree...)

Sure - applied it to x86/urgent.

Thanks,

	Ingo

[tip:x86/urgent] samples/seccomp: Fix 32-bit build

[tip-bot for Tycho Andersen]

Commit-ID:  a77d1d196bc63b37d9b4d1b614884669e8e79d32
Gitweb:     https://git.kernel.org/tip/a77d1d196bc63b37d9b4d1b614884669e8e79d32
Author:     Tycho Andersen <tycho@tycho.ws>
AuthorDate: Mon, 7 Jan 2019 16:16:31 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 8 Jan 2019 07:45:01 +0100

samples/seccomp: Fix 32-bit build

Both the .o and the actual executable need to be built with -m32 in order
to link correctly.

Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: James Morris <jmorris@namei.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: fec7b6690541 ("samples: add an example of seccomp user trap")
Link: http://lkml.kernel.org/r/20190107231631.1849-1-tycho@tycho.ws
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 samples/seccomp/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
index 4920903c8009..fb43a814d4c0 100644
--- a/samples/seccomp/Makefile
+++ b/samples/seccomp/Makefile
@@ -34,6 +34,7 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG)
 HOSTCFLAGS_dropper.o += $(MFLAG)
 HOSTCFLAGS_bpf-helper.o += $(MFLAG)
 HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
+HOSTCFLAGS_user-trap.o += $(MFLAG)
 HOSTLDLIBS_bpf-direct += $(MFLAG)
 HOSTLDLIBS_bpf-fancy += $(MFLAG)
 HOSTLDLIBS_dropper += $(MFLAG)