From patchwork Sat Jan 7 07:47:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 40316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1200868wrt; Fri, 6 Jan 2023 23:50:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfkaIs0Y37xxO/iwW06Fh1m+VRgfSqumj1TLhbozpog2IJij7k4nKCjLlByeUEXsv+70D0 X-Received: by 2002:a17:902:a5c1:b0:191:1729:d7e7 with SMTP id t1-20020a170902a5c100b001911729d7e7mr62314410plq.67.1673077838827; Fri, 06 Jan 2023 23:50:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673077838; cv=none; d=google.com; s=arc-20160816; b=PW5f/Yx1TpykmA2HpOXeW10Fn8kiMmjBaDnNHohVN7X2+tPp6miaqKUIDTlNcrROvB bvbsuTj+7jw7yCb408kifdQo/lYSnM93cBSnSCW0NePZZgL1qBQK3wqAac6h2RrnKFpN 2rx1ZE6Sw9EXXiUEL1GL+lIeM+fFDgDfzEZZeTkgnAg5asF/WYqBLc5wacFhhXxc2hNj GX7QQmAsEzRmm4guv6oaWd1X9bLBP+nMi0X+VFngbndpnpFOl7aixSCg5o5sdJevxtqi dhyY2NJme7BlZaXlY+MZRVlf/bsvbEIuXM1ut4TRNrLz6v9F5TNeVn6xlG4vf9shO0i9 vE1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Dgr+5PBDwLbg3WYaoIalIerZEx3eZPejV3RC9cBP+30=; b=hQamAzSMyqo4JCOJBO4euagczIdN9OUAlKdRyYqgYU6GHQBopzVqKqOTYmnWqsXU4h m749cdGIdBJhYwb7s5k/NWJOVoPLq7qSnABcYVkMPYvuAcveAMEJoZm43kNzoMPNaXpb Q6iaYv/4aee7R3fHOqostAws4UW5FSTHk7gv7VgJJ2qdCJ7J7sChGDSxz9Hi4PHZ79Gv 2Gwohu6ehz6dN0nG8Os8NYnAF7Od1QD4rtFtzQIP8rdqffx2kXDHTmSW5s+EwLNF0RP2 Fu3wNZF/BWdLV5MnO8xKbsFUHlROtucowAf4DMRq4GCM39jjaY+idqIwdpKcpZ7ly71B A0ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EARISaex; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p23-20020a170902a41700b001890c6feffasi3024550plq.568.2023.01.06.23.50.26; Fri, 06 Jan 2023 23:50:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EARISaex; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230113AbjAGHr6 (ORCPT + 99 others); Sat, 7 Jan 2023 02:47:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjAGHr5 (ORCPT ); Sat, 7 Jan 2023 02:47:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1352848CD; Fri, 6 Jan 2023 23:47:56 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3DD3B608C3; Sat, 7 Jan 2023 07:47:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F5AAC433D2; Sat, 7 Jan 2023 07:47:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673077675; bh=ePoHU4GENwIfAdeBcPaqU+CazliNAW/mfkD74kveQSE=; h=From:To:Cc:Subject:Date:From; b=EARISaexCJgsuI1qYC7HkNS6XgtOzyD2kMMUX93hH15nIeJuIURFAkLiPjsDmfJlU JXVymnYlboNjuQb+asz7oHo5XxbVnkaR8KovfE7B7ctrMMxm077UQ9dgzc4JoJCaWA QUYnburKZuINVt5PNTg4Ur4YYvH5WDX3X6tuh+FYUk/tlUCNQLVY4teitmnvLEUDDb ILBFLtQ5zZ6QEpunjc+HNRaVlDHykUL0Q2AX53F+vjb5jmrRz388DQbC/s/dIAH4kb nm9060g5Lzkd5THkKaXfY3/jOmsj5cfS+XYsvCYFht+N2uUTGO73qq1RiPe3RtGgLU ryiLS1qHG60Sw== From: Masahiro Yamada To: linux-kernel@vger.kernel.org, Kentaro Takeda , Tetsuo Handa Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , James Morris , Michal Marek , Paul Moore , "Serge E. Hallyn" , linux-security-module@vger.kernel.org Subject: [PATCH 1/3] tomoyo: fix broken dependency on *.conf.default Date: Sat, 7 Jan 2023 16:47:41 +0900 Message-Id: <20230107074743.3352242-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754349267644041442?= X-GMAIL-MSGID: =?utf-8?q?1754349267644041442?= If *.conf.default is updated, builtin-policy.h should be rebuilt, but this does not work when compiled with O= option. [Without this commit] $ touch security/tomoyo/policy/exception_policy.conf.default $ make O=/tmp security/tomoyo/ make[1]: Entering directory '/tmp' GEN Makefile CALL /home/masahiro/ref/linux/scripts/checksyscalls.sh DESCEND objtool make[1]: Leaving directory '/tmp' [With this commit] $ touch security/tomoyo/policy/exception_policy.conf.default $ make O=/tmp security/tomoyo/ make[1]: Entering directory '/tmp' GEN Makefile CALL /home/masahiro/ref/linux/scripts/checksyscalls.sh DESCEND objtool POLICY security/tomoyo/builtin-policy.h CC security/tomoyo/common.o AR security/tomoyo/built-in.a make[1]: Leaving directory '/tmp' $(srctree)/ is essential because $(wildcard ) does not follow VPATH. Fixes: f02dee2d148b ("tomoyo: Do not generate empty policy files") Signed-off-by: Masahiro Yamada --- security/tomoyo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile index cca5a3012fee..221eaadffb09 100644 --- a/security/tomoyo/Makefile +++ b/security/tomoyo/Makefile @@ -10,7 +10,7 @@ endef quiet_cmd_policy = POLICY $@ cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@ -$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(src)/policy/*.conf.default) FORCE +$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE $(call if_changed,policy) $(obj)/common.o: $(obj)/builtin-policy.h From patchwork Sat Jan 7 07:47:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 40317 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1201204wrt; Fri, 6 Jan 2023 23:52:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXuT/DerCmE8GO9szQTPes/Fzi5suweddiOB4NiZdx1qnWAtsFplXS+xyj5bl9R7HRI1/E87 X-Received: by 2002:a17:90b:3c0a:b0:226:1e1:f0bb with SMTP id pb10-20020a17090b3c0a00b0022601e1f0bbmr39416412pjb.26.1673077937945; Fri, 06 Jan 2023 23:52:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673077937; cv=none; d=google.com; s=arc-20160816; b=Nh8Xg9RhbFS6Lvf8zG542pBlFepoLN+5HleV2srylwN/rsHIuXsOZsP5j4so7FjAlW ML9l65b/N/FLAKsmIsuxPm6zYV9DnWd75jEdAXINwB7t3Riork4/Yw4sEcThrPHNIC3c tXm0seYwnIzj59XsQQCI1nk3CMtTiXpdnco+6pLuW7i8Hc8VBGEbpRPh/wImUvSVQF6q xzWirICx2YWuklLqbgNiUBMpx2WkaAe32EzLXg0yic5NCB0ewH5mqPwfNq8tvgx+KlBB uFNdAPMHJYcJ4Bb+AnkEFgDEBpDSeOo+NL4kJFwAd2GJL+X5tH2bldV8ieokuHpQASSJ 7MoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ubsBpwyZJ0ygA3+3lLBLRkM4L+ObCLnLn/O83Nwz0wM=; b=OtE9q5EVaVSZtZa3Bt8C4KFpfN0dagNI72Ufz3V00uzW8LuBGx4s60Tfd/fVm80uI1 DpFs8tRa7lmVQwbziC5E4omsDLWWSh9/DAsCVvcWCSmn2njT34Ztd/6LtEdyRfdSxYeA lVV4qTbf7aRY+FAQlWScbkDRPERaBmbNOSkBzYBPvMiLKP3miM87k+qgP1812vXHmJtT FoZ8nu2C5FUZGlWWLwszVjAB+Mqr83Rx28WVDkv9sWTiNnLPvTvrqNmXgHXv0EQ++a/c YeXBiGsFqxC9EhyxSJ6LvaAUo2KK2p2cO6F+keqoBVVXtG434b6wn27Z0+2PICPz6dZw 88cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="YVRk40e/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nu16-20020a17090b1b1000b00226e4692ceesi4186642pjb.182.2023.01.06.23.52.05; Fri, 06 Jan 2023 23:52:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="YVRk40e/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231580AbjAGHsG (ORCPT + 99 others); Sat, 7 Jan 2023 02:48:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230454AbjAGHsA (ORCPT ); Sat, 7 Jan 2023 02:48:00 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73B5684BD2; Fri, 6 Jan 2023 23:48:00 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0F6F5601D2; Sat, 7 Jan 2023 07:48:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 527D0C433F1; Sat, 7 Jan 2023 07:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673077679; bh=hqHvkpN/5QY5kQ1YmgQ/2OzEEuyZYjiS1pSN/GVMGhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YVRk40e/oAnznXDkuXepm//q4JFO2oAB1e9wklbaybrFCFVYoboqTxmYvTCRa7zbb TCRqd/GAyZ5Du2XPDaUTlF60qex5IGiaH/LCXw5SQvQ1VJv766W8rQHBldWZgisgBS 2vGIDCLsk5z1d/w2CW2ZgFM9+n/DqrYL62x0dW5u2t8uBlFngSW7NVhUSYW+hA326/ 2ina9ctKNdaW1W/+lWNxTGDqLvLwNaQaDY1gB1KMJKqaZR/4A/ypMa+P4l4Tcya+lv OhxAR/Pq6k6ZdY4wnPMi1aH46R24/wVOo4jmnZYCkJwgFV08YpKFF7PbKVmftyfiYb IY0SJQlQ16lIQ== From: Masahiro Yamada To: linux-kernel@vger.kernel.org, Kentaro Takeda , Tetsuo Handa Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , James Morris , Paul Moore , "Serge E. Hallyn" , linux-security-module@vger.kernel.org Subject: [PATCH 2/3] tomoyo: avoid unneeded creation of builtin-policy.h Date: Sat, 7 Jan 2023 16:47:42 +0900 Message-Id: <20230107074743.3352242-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230107074743.3352242-1-masahiroy@kernel.org> References: <20230107074743.3352242-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754349371583932831?= X-GMAIL-MSGID: =?utf-8?q?1754349371583932831?= When CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y, builtin-policy.h is unneeded. Signed-off-by: Masahiro Yamada --- security/tomoyo/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile index 221eaadffb09..1b18a02ccd2e 100644 --- a/security/tomoyo/Makefile +++ b/security/tomoyo/Makefile @@ -13,4 +13,6 @@ quiet_cmd_policy = POLICY $@ $(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE $(call if_changed,policy) +ifndef CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING $(obj)/common.o: $(obj)/builtin-policy.h +endif From patchwork Sat Jan 7 07:47:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 40318 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1205820wrt; Sat, 7 Jan 2023 00:09:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXuXK5F/Y4QYv1jbNT/ICQ8il/0uOzBfx4QB1pDBaCf0dtYJDUAxghmgzLDIeE4j4mpOtRB2 X-Received: by 2002:a05:6a20:b29e:b0:ad:48b3:c5d1 with SMTP id ei30-20020a056a20b29e00b000ad48b3c5d1mr60135018pzb.47.1673078948196; Sat, 07 Jan 2023 00:09:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673078948; cv=none; d=google.com; s=arc-20160816; b=wT3eL19L4uNuYr4VueP5RknXzoVdZ/nsk8yH8Z3l66Q5teBe3TzmUiqFUFbeF9Zge6 c735QrTpMQYahLVIi79UYT7rA/YVTAjr/ibnklE7DxrH19/QKvN3DejskdXwobCxFim3 PwmJ3wiic0GkHRg3FpMHZlItk2dTVJzhwg63LdWjV8NXnmXmZb1dRwF1+wnChABHdSjM YhNdq3uHPh4s5w/Chlavthg/PYWIislUCLztPwLwwW65I/Rfd/Dq1MXMESnXm4DV9uVx sKRODuW6lyNVcz27wDK74ZLVat5YUsvTiLAq1Z/prkq58Vlm/XPhJOgQMQqrxZ8ntdbC U44A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=41nqa8sfQCl0OQtMNYUXZdRTsNtgjprnmmPwhB9bhBM=; b=CzbrhoQr8C7agnS61xAkiMvkDTGm8/38WBsl+H9PSDGKjrITz3Oczer1DZDcq4SeG3 75iK8SfqaWtHWGaz1Lbx8WdHv+lqg54lwEOebh9dpRud20I5h0joqfLvtXy0ZI/qAZb5 FP5c1QsKaxdyaJ8/dO1zGod42ka+K54og91yRB2GfPjGryGlVb7Ah2wk9qMlKqu5D/9c +uPmConBTEgFMVijJuGzYx5MMMoZogyopANGXsVTVdPCv/IJDREEZQ3FO9XeNOykM8j8 yuOwRmyVT1RgyNnyoPQ7vd6nrDZS2M4TU8/ODaQH/SV8/+rOiNN1s6Ug39VBxMNpxs2k C+kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=juaCeWzo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a21-20020a63e855000000b0047916fa90e6si3777332pgk.873.2023.01.07.00.08.51; Sat, 07 Jan 2023 00:09:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=juaCeWzo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236595AbjAGHsP (ORCPT + 99 others); Sat, 7 Jan 2023 02:48:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231819AbjAGHsI (ORCPT ); Sat, 7 Jan 2023 02:48:08 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5240848D7; Fri, 6 Jan 2023 23:48:06 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1760FB81EBD; Sat, 7 Jan 2023 07:48:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C07CC433A0; Sat, 7 Jan 2023 07:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673077683; bh=RTLKdjUECYDxN3vnqCPtfGzhyPkDlqfYSeIu5deVu7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=juaCeWzoPppUgCgLAK5poNkr4NGkQHZChSrHnc6v0NXJUrh/bjqfPkLLJPfoKrS/S Kx2/niq7Ryk1XIu6Vgc7/0AuEl3+yDECZmIlzNMlN0zeSfbGPQngtfly6fFfUy/nmT hVJymkx4kloc6n/XAgK171QkYSC/K0V7H5JzTeuaf1mchFVqjlN6S2lTmr25uAQmym iShi9MiZPF7mrU0/57SbX/qydgO1NYZNsY2Q5z9NAhTWPhb7OnPewDMX3OIlMwJoVf D14jYp1rTpsU65bAx2rjXncUys3JFYCTVcdBINy4xyS5x6YU0gVS5xOBU8e66lT1kV 4fSPQ/T5rKP0A== From: Masahiro Yamada To: linux-kernel@vger.kernel.org, Kentaro Takeda , Tetsuo Handa Cc: linux-kbuild@vger.kernel.org, Masahiro Yamada , James Morris , Paul Moore , "Serge E. Hallyn" , linux-security-module@vger.kernel.org Subject: [PATCH 3/3] tomoyo: Omit use of bin2c Date: Sat, 7 Jan 2023 16:47:43 +0900 Message-Id: <20230107074743.3352242-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230107074743.3352242-1-masahiroy@kernel.org> References: <20230107074743.3352242-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754350431226441447?= X-GMAIL-MSGID: =?utf-8?q?1754350431226441447?= bin2c was, as its name implies, introduced to convert a binary file to C code. However, I did not see any good reason ever for using this tool because using the .incbin directive is much faster, and often results in simpler code. Most of the uses of bin2c have been killed, for example: - 13610aa908dc ("kernel/configs: use .incbin directive to embed config_data.gz") - 4c0f032d4963 ("s390/purgatory: Omit use of bin2c") security/tomoyo/Makefile has even less reason for using bin2c because the policy files are text data. So, sed is enough for converting them to C string literals, and what is nicer, generates human-readable builtin-policy.h. This is the last user of bin2c. After this commit lands, bin2c will be removed. Signed-off-by: Masahiro Yamada --- security/tomoyo/Kconfig | 1 - security/tomoyo/Makefile | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/security/tomoyo/Kconfig b/security/tomoyo/Kconfig index b9f867100a9f..772d2ab58fd1 100644 --- a/security/tomoyo/Kconfig +++ b/security/tomoyo/Kconfig @@ -7,7 +7,6 @@ config SECURITY_TOMOYO select SECURITY_PATH select SECURITY_NETWORK select SRCU - select BUILD_BIN2C default n help This selects TOMOYO Linux, pathname-based access control. diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile index 1b18a02ccd2e..77358b7655fa 100644 --- a/security/tomoyo/Makefile +++ b/security/tomoyo/Makefile @@ -2,13 +2,14 @@ obj-y = audit.o common.o condition.o domain.o environ.o file.o gc.o group.o load_policy.o memory.o mount.o network.o realpath.o securityfs_if.o tomoyo.o util.o targets += builtin-policy.h -define do_policy -echo "static char tomoyo_builtin_$(1)[] __initdata ="; \ -$(objtree)/scripts/bin2c <$(firstword $(wildcard $(obj)/policy/$(1).conf $(srctree)/$(src)/policy/$(1).conf.default) /dev/null); \ -echo ";" -endef -quiet_cmd_policy = POLICY $@ - cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@ + +quiet_cmd_policy = POLICY $@ + cmd_policy = { \ + $(foreach x, profile exception_policy domain_policy manager stat, \ + printf 'static char tomoyo_builtin_$x[] __initdata =\n'; \ + sed 's/\(.*\)/\t"\1\\n"/' $(firstword $(filter %/$x.conf %/$x.conf.default, $^) /dev/null); \ + printf '\t"";\n';) \ + } > $@ $(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE $(call if_changed,policy)