From patchwork Tue Jan 8 21:04:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morris X-Patchwork-Id: 10752873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17EFC14DE for ; Tue, 8 Jan 2019 21:04:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0744728E14 for ; Tue, 8 Jan 2019 21:04:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC95228E1D; Tue, 8 Jan 2019 21:04:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D7C328E14 for ; Tue, 8 Jan 2019 21:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728987AbfAHVEq (ORCPT ); Tue, 8 Jan 2019 16:04:46 -0500 Received: from namei.org ([65.99.196.166]:55064 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728794AbfAHVEq (ORCPT ); Tue, 8 Jan 2019 16:04:46 -0500 Received: from localhost (localhost [127.0.0.1]) by namei.org (8.14.4/8.14.4) with ESMTP id x08L4cE0025412; Tue, 8 Jan 2019 21:04:38 GMT Date: Wed, 9 Jan 2019 08:04:38 +1100 (AEDT) From: James Morris To: Linus Torvalds cc: linux-security-module@vger.kernel.org, Ingo Molnar , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook Subject: [GIT PULL] seccomp: build fix for v5.0-rc2 Message-ID: User-Agent: Alpine 2.21 (LRH 202 2017-01-01) MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 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 Reported-by: Ingo Molnar Signed-off-by: James Morris 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)