Re: [GIT PULL] seccomp: build fix for v5.0-rc2

From: Kees Cook
Date: Tue Jan 08 2019 - 16:12:12 EST


This was already picked up by x86-urgent...

-Kees

On Tue, Jan 8, 2019 at 1:04 PM James Morris <jmorris@xxxxxxxxx> wrote:
>
> 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@xxxxxxxx>
> 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@xxxxxxxx>
> Reported-by: Ingo Molnar <mingo@xxxxxxxxxx>
> Signed-off-by: James Morris <james.morris@xxxxxxxxxxxxx>
>
> 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)



--
Kees Cook