From patchwork Sat Nov 7 14:18:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 1396157 X-Patchwork-Delegate: daniel@makrotopia.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=jvrU2Wti; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CSzss0wc0z9sSf for ; Sun, 8 Nov 2020 01:19:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=GVUewb13KN740RWXul8hWpzDa3awTvoo96TGE/pjcxM=; b=jvrU2WtiQ7BVBh6TvQvqJrAykM 30mgc7sCv1ya7yPfoEd7yaJMiEz4VWDVIbxhFV1xbtAVcvfD31kF49Y42OmXFkfyn4edNueEEDvH/ 82n7ouyJLL8KC99NA2ABhoMJ7jxOk49VtjLdlkXfHd5lIgNh428ZKBBUHdaBONy6rOIc28CHkCHcg SU3Z7N3alHnJK9aScM8KjzdC3mNL/Hs6pmjfgA6KEBPswIjwYKS6d7EJJQthWGt2oz9p9CcOQDfFI 5IjynjnwQoXtExLZ++ftjqdK0eoj6FtGU2KKjaiFkKGQ2MGIZAqB0zAGu2kpvnEXBO7+roWtzOtO0 D/JBwZPA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbP2t-0007ss-5O; Sat, 07 Nov 2020 14:18:23 +0000 Received: from fudo.makrotopia.org ([2a07:2ec0:3002::71]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbP2q-0007sW-Re for openwrt-devel@lists.openwrt.org; Sat, 07 Nov 2020 14:18:21 +0000 Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.93.0.4) (envelope-from ) id 1kbP2p-0005bp-D4; Sat, 07 Nov 2020 15:18:19 +0100 Date: Sat, 7 Nov 2020 14:18:12 +0000 From: Daniel Golle To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] target: select procd-seccomp if kernel support is present Message-ID: <20201107141812.2olgdlw3vimnbzhs@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201107_091820_980220_A5763917 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Schmutzler , Petr =?utf-8?q?=C5=A0t?= =?utf-8?q?etiar?= , Roman Kuzmitskii , David Bauer , John Crispin Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Install ld-preload hooks allowing to add seccomp filters for arbitrary services if kernel support for seccomp is present. Signed-off-by: Daniel Golle --- include/target.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/target.mk b/include/target.mk index 7a74aceb59..d8cb0e6e58 100644 --- a/include/target.mk +++ b/include/target.mk @@ -41,6 +41,11 @@ ifeq ($(CONFIG_SMALL_FLASH),) DEFAULT_PACKAGES+=procd-ujail endif +# include seccomp ld-preload hooks if kernel supports it +ifneq ($(CONFIG_KERNEL_SECCOMP),) +DEFAULT_PACKAGES+=procd-seccomp +endif + # For the basic set DEFAULT_PACKAGES.basic:= # For nas targets