From patchwork Fri Jul 26 02:10:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169773 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370566ilk; Thu, 25 Jul 2019 19:11:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqz2NKUQNdGW5Qkuc8G3222Ww99hKW1/3dhzTYgnFKEE+1J1nrzzTa9mS51woe10j2iFMhbP X-Received: by 2002:a17:90a:3086:: with SMTP id h6mr97515381pjb.14.1564107113634; Thu, 25 Jul 2019 19:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107113; cv=none; d=google.com; s=arc-20160816; b=CzQJaqRCRZTncNgIz4UYDDL5QcmnrbjCVXOfetN4FFfNjKOja9/gUrEaP+LXN1VPuO 17p+F2euA+YTQ0g+7rgxhe9hLlX4lddVc8GmF78bYqY7HB3uLxE3Zu7VCOyK4wunHUAc vDuISxXW/DiskyVW8LKtMZyz5OR3w+mKx62hAAWc29M4kLARiR3LCko5uT9t7Lge1Iln XuAOQI4j4TDgN1E90WNf4mqJlHfMnFBYkbuRrgR4LoeK41tUB5gTpp3tOtKNEFZ6wdGO VBVitkANr4QGGQP6w5hwf8vqDLnxCA4l4lJDG2Ky6AC+qZpsjsuXc7sa7X6cNKzbgjSO 4OiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=HtcIZbZ1cRNbQwQ8xFJxK6kDpAQ+ysB+8/CuJSWfBmU=; b=kLFKkWfUFpFnQ2vCcicl1Nr3DZQG+JTqob5e4iK5lfYDOhI8QKgfUXaBM4lIqR6WkS IrAgkXeyHBrm9EUL0j3OErhV+WH4g0EqZNHxODnoSxecXZG2DjmxvQJeMY2wfuQRPVI6 4ZCvubjkhVhaQeLGG0ZazVmtJ/c8ZOJD/4qFXFMspeNrTBp8gaAE6Who4SHo0H/TOfdc 12oW5I7WH+1J8bM2p0eKXt8acZR2RcSgSPoqMZ1+QhcgnFrKgiqwDP37ia4bIyauKp5Z hzrQyPhVUYiGVrKY52kos4QIjh/hG+6EcofhctJBiuNWzPl1a0aRJAv0L+TRYCDr+s8Z Ta/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=dUApB1VG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ci5si19257391plb.45.2019.07.25.19.11.53; Thu, 25 Jul 2019 19:11:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=dUApB1VG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726277AbfGZCLw (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:52 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63684 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726000AbfGZCLq (ORCPT ); Thu, 25 Jul 2019 22:11:46 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03j020523; Fri, 26 Jul 2019 11:11:01 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03j020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107062; bh=HtcIZbZ1cRNbQwQ8xFJxK6kDpAQ+ysB+8/CuJSWfBmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dUApB1VGtbZ7YUhYHnmVTvbvV4McLS446urzu4TTIrCx6Q3uzjOXkejckWvxWj0Ny NVy979g1POs6m9GgEH1PVmliV+NSBj2CT5XFuFq4DqXXr0TZGArMAncmaLAO5uOXl6 tOoAnXg9snAbHp5BoxQKYV37oYvFCTgTb0PbISJNh7xRO1megtbpTk9cVECvy7jJ/D f6xwBqVY73xZCbjtmlakoN05mP8V4G/tBCqg6qpiRYSQwbCNRY4/drTsYrvrQeLJz7 MdYDS8mOf4YiQ91NP+RL1ed6bIiuPQTQ7EVudW5KAysyzD88m7WsQs0JmF/BqkNl17 9a1YdDVcwhWKQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , Dave Howells , James Morris , Josh Boyer , Martin Schwidefsky , Nayna Jain , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 1/5] integrity: remove unneeded, broken attempt to add -fshort-wchar Date: Fri, 26 Jul 2019 11:10:54 +0900 Message-Id: <20190726021058.4212-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I guess commit 15ea0e1e3e18 ("efi: Import certificates from UEFI Secure Boot") attempted to add -fshort-wchar for building load_uefi.o, but it has never worked as intended. load_uefi.o is created in the platform_certs/ sub-directory. If you really want to add -fshort-wchar, the correct code is: $(obj)/platform_certs/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar or, in a more Kbuild-ish way: CFLAGS_load_uefi.o := -fshort-wchar But, you do not need to fix it. Commit 8c97023cf051 ("Kbuild: use -fshort-wchar globally") had already added -fshort-wchar globally. This code was unneeded in the first place. Signed-off-by: Masahiro Yamada --- security/integrity/Makefile | 1 - 1 file changed, 1 deletion(-) -- 2.17.1 diff --git a/security/integrity/Makefile b/security/integrity/Makefile index 19faace69644..b6d6273a4176 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile @@ -13,7 +13,6 @@ integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyrin integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o -$(obj)/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar subdir-$(CONFIG_IMA) += ima obj-$(CONFIG_IMA) += ima/ From patchwork Fri Jul 26 02:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169775 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370661ilk; Thu, 25 Jul 2019 19:12:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFjSe04Lk1Gj5ZIglV4VOcLPJfWJEVquRXezOuFfNj5L7ZU9eUtiBPEdlLM3gVNZHShkXn X-Received: by 2002:a65:6288:: with SMTP id f8mr83458432pgv.292.1564107121490; Thu, 25 Jul 2019 19:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107121; cv=none; d=google.com; s=arc-20160816; b=zsCMXeIHFSYix7fROoa/EjA1gKRW7gXi8D5QUSmystd2JeW7kVmBp8RK8n4Zombzfi p2xF7GeNiRcEd3ipmpoFAWej8q+o9KfnkwQVLrhM1QDfK61w2eMA9WCSz6YGFbCG9u5V QuCcONNnYHJHl3IN5dqkCZsPuNvyw3Bt3vCR8W2JeA6R8DvF35/F1el3RtxOBBML6let K4fV2bAF8hAU4k8983eTUkbqlDdPf0hAumivDMPzce8XxD+K9rmvfLHC6tdlTDpUJRa5 QA0puKaDvOKokckZO4tzQQtbOqOa4MlT1aeimJKjo6CJiG/Cn4w3w8RVXkS/sIBCgL2K GTRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=nOKtkgXfIVcWv2vTVE3jpIpHqbVnmkI/DmNIReebTe0=; b=k2MuyOOZ7Ot6R3hMUqf1/E5IXbr7kr2EY28CrD8iUFCAY5QwyvLO2duchKVNzp7Nbk E+Gttu8gCmpw93aYb8Tab00Ul0lk11UHLVeb1ajinKqoC7Q/LqecHuZ0Zq4cZaxwO8UH h/xSjvwo1db9B7CA1sn6AHnMZxs2eVBXM2ABLlaDR/72VddOGXWuJ+vuwsMm6/V0P+w0 WXz0kOi6wGCGM1oqknF4uTQt0ceXgvYH0DSU4zcEBEQpaj8vESD1caQZFr4LCJ0XO4kv yN4L24crV+ucTXPfOhLUQK03oTTNG1DkQRoFfZBRmqER7X3W1pB5EWjXoLIx8lvD9Nbc 6vKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HHlRhbNo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q38si3208981pgk.63.2019.07.25.19.12.01; Thu, 25 Jul 2019 19:12:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HHlRhbNo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726305AbfGZCMA (ORCPT + 29 others); Thu, 25 Jul 2019 22:12:00 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63670 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726043AbfGZCLp (ORCPT ); Thu, 25 Jul 2019 22:11:45 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03k020523; Fri, 26 Jul 2019 11:11:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03k020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107063; bh=nOKtkgXfIVcWv2vTVE3jpIpHqbVnmkI/DmNIReebTe0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HHlRhbNo1ln2bJlCtBH2WZ40lxEa9J4wi+PaKV3i8SSd0c35WyDiSS6wXPknju9om 8B8KdYixmjkrlC5Y6Ki7VXcaWnIylTAeNDz8PKh2SR6P64FwOoCUdtcsSDZKBzN/kU MrVLStkWF9L0N0+rdsKhfrwFXXrc152JFzW5S+j0usjaQtNNxiUJ32BF/K7V7/dMt+ EjjbSFxnpIM47qP/GFmAuyG5F2ZjWyRO2ZwyhxRmUKIcy36bpYd8Ujzq7PCMG4EZmI t1vn5ogE8MceqLOboNsb9S82127dFNyWK3QFji0MklniUOJlSBaH7HCRWy6sMZd0dZ 5UOYvSEDoRPxw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , Dave Howells , James Morris , Josh Boyer , Martin Schwidefsky , Nayna Jain , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 2/5] integrity: remove pointless subdir-$(CONFIG_...) Date: Fri, 26 Jul 2019 11:10:55 +0900 Message-Id: <20190726021058.4212-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ima/ and evm/ sub-directories contain built-in objects, so obj-$(CONFIG_...) is the correct way to descend into them. subdir-$(CONFIG_...) is redundant. Signed-off-by: Masahiro Yamada --- security/integrity/Makefile | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 diff --git a/security/integrity/Makefile b/security/integrity/Makefile index b6d6273a4176..35e6ca773734 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile @@ -14,7 +14,5 @@ integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o -subdir-$(CONFIG_IMA) += ima obj-$(CONFIG_IMA) += ima/ -subdir-$(CONFIG_EVM) += evm obj-$(CONFIG_EVM) += evm/ From patchwork Fri Jul 26 02:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169772 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370521ilk; Thu, 25 Jul 2019 19:11:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqw9PuJSUaRyeDWrTCdK5OkhMAUhjwx9wk/0/8AiabM/ev9joDe+tDQXq6oBd/L2dl4EnSJb X-Received: by 2002:a62:5c3:: with SMTP id 186mr19663841pff.144.1564107109783; Thu, 25 Jul 2019 19:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107109; cv=none; d=google.com; s=arc-20160816; b=P+/hJWyqE4jgL8dIpgJVKXu/lFWM4MzyFurGFzHYkjTZynDYI/FbbLXFr9+PNun0Xk lStOl9X/0eC15WxF1treWlRle8/ghnbZnfnS5UfyV/MwcKQSVpvM7B8tV3rJll91MtHc x/Zg/9QAgdVLdOr43XnbQO7taOlQL5vRuOtCsWxATIwBV+fpjNu5Cl/uC5Bd/0BAE3yG FyLwogLqcc4z5g2NMII7E4yCdizvuc7ApZalJvjgbyOHxWDh79GtDA5geNoys2H5XPnM skq0zGfPn34ZyBS0UgZ+tAbpNb72jNEpzsP/udtZN3vech43TNGNVH4UV0cchx9ZHIRq jgpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=d0XIimaYVsZuor/Vqvat3vZ1jPTCJjSdyV2UnY7OLcQ=; b=kjK0lX23mBX/N/VlXvQNkzXGnZdyfgLo2NiY712sX+yNcadmDONu0gQ7mQX7SXNZ7T /kZ40xqsCSdna44UTQLik8pCW3TFEFw9NjANkOT/Idm19jgdZzUOtmmwA7GasGKqu/DJ CdfYiT93Jp2GaQc/Hnn1bo8za6rEYiTh+tVgRHB7lqdFGc4hCfVHMuDJu5b4NxyOyh8x rjDwSYYRddEBsja9PAnR+6CEQsF+cJX5IEWprN9eo1wDlgZc6lxrv9SuXmQA4b6LcdFe phEZTeNnf2wlKwht7ReWdps5LZf8PHyw+Fv46Kskp73Y42GJXi57yqpwvTggLsoVIGUs +jNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=wbo3cxpR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ci5si19257391plb.45.2019.07.25.19.11.49; Thu, 25 Jul 2019 19:11:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=wbo3cxpR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726195AbfGZCLs (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:48 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63665 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726023AbfGZCLp (ORCPT ); Thu, 25 Jul 2019 22:11:45 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03l020523; Fri, 26 Jul 2019 11:11:03 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03l020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107064; bh=d0XIimaYVsZuor/Vqvat3vZ1jPTCJjSdyV2UnY7OLcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wbo3cxpRfJwWVXDE26VHPcZJzvkvNPmdtSZzhaCH/OleeiJo9oSsmQa4nM+LrBxZg jKlgx8BYKcXVSFGrXxyFiG54oKueKUWsFi738OIOmdKo9xua1720j1j7tGlCzXs1hn es9RTXA6gHvxt8YcxXZKtrWV9eEkZuDloj5BsGn5lhFm+kbi0X6kPuj4/9WBIp/S1e Vxe5njb7eGHy+fY+Dg3j0Q0hZILr5jBVah8cU3o4QgRnNhBinAii83DCHbsdEK3+XH Esj0rHgLwTKeY5QU8xV/ltusQxMn6dDjYstdEVeNlljsWUh/O0I7a2+hUuGyWVhGM2 ANCgN1FC3r1lQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , Dave Howells , James Morris , Josh Boyer , Martin Schwidefsky , Nayna Jain , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 3/5] integrity: use obj-y for non-modular objects Date: Fri, 26 Jul 2019 11:10:56 +0900 Message-Id: <20190726021058.4212-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_INTEGRITY is a boolean option, so none of these objects is linked into a module. All of the other CONFIG options here depend on CONFIG_INTEGRITY, so there is no point in creating the composite object, integirity.o Flatten the code into the obj-$(CONFIG_...) form. Signed-off-by: Masahiro Yamada --- security/integrity/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/security/integrity/Makefile b/security/integrity/Makefile index 35e6ca773734..53bb1d70e631 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile @@ -3,16 +3,14 @@ # Makefile for caching inode integrity data (iint) # -obj-$(CONFIG_INTEGRITY) += integrity.o - -integrity-y := iint.o -integrity-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o -integrity-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o -integrity-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o -integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o -integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ +obj-$(CONFIG_INTEGRITY) += iint.o +obj-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o +obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o +obj-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o +obj-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o +obj-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o -integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o +obj-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o obj-$(CONFIG_IMA) += ima/ obj-$(CONFIG_EVM) += evm/ From patchwork Fri Jul 26 02:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169771 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370497ilk; Thu, 25 Jul 2019 19:11:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZOB5f8SSQlChLy7bKisGlW+qB2eTNn24PhkxhdRwpcyZ2jDV3W8MJpHp+8rTdnDn14bJ1 X-Received: by 2002:a62:754d:: with SMTP id q74mr19121479pfc.211.1564107107288; Thu, 25 Jul 2019 19:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107107; cv=none; d=google.com; s=arc-20160816; b=jTgwClUa5x6+jbT6Vd3rZiVJe6FkTQk+p+G2qzkdgXEDnxqlOgSxTDG/vxnVj10x6u HGglvDMEpfNdoZPHM8l8ZyqTvS6jhdzIDiSPLzzwy2EJt8RTdAqAnlRvi2tX4fmshsce PBoe4eiVe0vhxm+dl/3VeyfRJfE/D5K6M5VwgDhs4D0pZnuB8kf6JmPqkjAYhB5XPC+m YDIjM1Lh4fiemZUVLHo85TigGzAjbk4v17e/iKXY4dAblVIzwhDUnDW8gYp3+vAS10aJ UXDyTuPtDKiAZqyAaP/j4P9KpTku8M1eaq7wcRVu2ZjvOzHGnds7UkJrX3tyHQXI66mQ 2RJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=2py97rXQmeBJv0x49nST5dYu797IUCM7mWTUZUS20lY=; b=Z97pBaacR24O73wiwgRZodYP1u83Bj/738eYuABUUO02Jtz5YM1FsnQU2Urh0ZPF8g OJW8uD33qEh3lSBm34EpR9aRiYkCCe14OjvKXCqnXhNeMBIVu8QyveK/iSqAITX355QG egojpDiI24lYXXrXAGzPxzWCO0Cdvk6jVTRMpH2Df/76O6GbDBhopReaS4nNEKNt3T90 HLGp7k06jXJUQZbVdxD/qqZ91v41+sKrEVahvSPqRXnOmDHmBNbJwVVu9w+Q9jnJB+1C cNXE9jncs3LypZMVgEdlyoq8AH6YL5hdBNrAp742Zs5Cx8F8GoW7+imL5fOA6+baRMmH DYpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=MXTzbm4u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e13si20681578pfl.279.2019.07.25.19.11.46; Thu, 25 Jul 2019 19:11:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=MXTzbm4u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726148AbfGZCLp (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:45 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63653 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbfGZCLo (ORCPT ); Thu, 25 Jul 2019 22:11:44 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03m020523; Fri, 26 Jul 2019 11:11:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03m020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107065; bh=2py97rXQmeBJv0x49nST5dYu797IUCM7mWTUZUS20lY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MXTzbm4uOdkuSdZBWHV2rF+A3QgFM7x2x+mWb3z+COmAhltTh4e67vwYhx6iyiTA6 /FEanUpRLEBSYNwyQGaPJ3+cA1R/J8VyXHEmA63HfXDQjgjPS1qURaoACzCHNwuJ3n Q0yRW6ff5zMqvLj+AHdWPTvEyy7gd4h8flSJFV6DyNwwd/viWiL8IEK3Wh5WOBeZ6U Ic/pQxZYWBYTgLB614/VwvRA4VBheSEBj7bFlOkYBP7ZhbEhLf9OC53M5gSKpYelUL /B4C9AdZydWf5TCmq0GKUS+lcVOL4pfVfMVBR9l98AJ2T0oowPWqOfVNzx0+Gwpu4K Emm/8uq34ANBQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 4/5] IMA: use obj-y for non-modular objects Date: Fri, 26 Jul 2019 11:10:57 +0900 Message-Id: <20190726021058.4212-5-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_IMA is a boolean option, so none of these objects is linked into a module. All the objects in this directory are compiled only when CONFIG_IMA=y since this directory is guarded by the parent Makefile: obj-$(CONFIG_IMA) += ima/ So, there is no point in creating the composite object, ima.o Flatten the code into the obj-$(CONFIG_...) form. Signed-off-by: Masahiro Yamada --- security/integrity/ima/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/security/integrity/ima/Makefile b/security/integrity/ima/Makefile index d921dc4f9eb0..5517486c9154 100644 --- a/security/integrity/ima/Makefile +++ b/security/integrity/ima/Makefile @@ -4,10 +4,8 @@ # Measurement Architecture(IMA). # -obj-$(CONFIG_IMA) += ima.o - -ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ +obj-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ ima_policy.o ima_template.o ima_template_lib.o -ima-$(CONFIG_IMA_APPRAISE) += ima_appraise.o -ima-$(CONFIG_HAVE_IMA_KEXEC) += ima_kexec.o +obj-$(CONFIG_IMA_APPRAISE) += ima_appraise.o +obj-$(CONFIG_HAVE_IMA_KEXEC) += ima_kexec.o obj-$(CONFIG_IMA_BLACKLIST_KEYRING) += ima_mok.o From patchwork Fri Jul 26 02:10:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169770 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370448ilk; Thu, 25 Jul 2019 19:11:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqx2g0m1jz+5ln8Q+ZXUce7oXlzYUCmj9wHk8q9I+TYRMLO/dFhIR9NkaCdxbJ3fbu6Zm8Ck X-Received: by 2002:a17:902:f213:: with SMTP id gn19mr96472358plb.35.1564107103373; Thu, 25 Jul 2019 19:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107103; cv=none; d=google.com; s=arc-20160816; b=pJhutAV+xDdirn7slq5oueeVTG64OISzhN6G5QqcxNqPNQViYsFnOBIo65ifkQki43 yn7FO1LzyNbO9PQjSvmvPh3sTDR9BavsihILHaZk7rfjOo4brhnLTiV7/oi3vOZ9QWI0 HdUB9zQCbT6wUcZfZwUMzTm1byeqaEmbnJ6YV6+fOiLcyTmnxZmcPt3iRql2cc+3C3M2 7AYk1Tb7aP2p9QcfrWR2toDX0t2pbEUwEyLQR/vl4env+roY4pLUKCugZ+Gq0oQFHt+7 uMOhc0IZyt7GSOziMZLxuZas7X3KT+Lw5SVZhDieFaTPQVu9cVBjiW2LcKC5kKLPgm2O aLpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=tnYEZud056hAhoewZO62tSceN4oWh0Eu5vKNqgUHTuA=; b=hkiXrqSb3a8dksXlxrD3y4yxrM8AadGlGlVOieGdNEvQRmx/togFSaSSRx/PKIKk1N L53ibqt7wTHDjwsl/Zqvn5s2CRRkCZGg8uu/EDVPhtJSh8M+z1gh5YdZ2rMqrqeNsFpS qPQU3biMLc4q4wN+3Ft+GaTG9MH0tncqB0TnB1w4MNNhaohQbxXp3NZ3fiUS92SVNEyD gDmw7OOqtWw3tS2YKSbaGD/2RWc0VCZMcM0e4pWCLGJ0nTOahkyhycihTWyPDkJfm8f1 +mc4G7vgIzY3kodSgQVtoe6T507sMD9WXQQYyFYJMqptiGJmAXLN3sihZcyDTbRh+Rlg Ea6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eAQTARqB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p44si18581782pjp.0.2019.07.25.19.11.43; Thu, 25 Jul 2019 19:11:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eAQTARqB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726005AbfGZCLl (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:41 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63576 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbfGZCLl (ORCPT ); Thu, 25 Jul 2019 22:11:41 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03n020523; Fri, 26 Jul 2019 11:11:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03n020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107066; bh=tnYEZud056hAhoewZO62tSceN4oWh0Eu5vKNqgUHTuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eAQTARqBJdu5M8oLYd9bZGW5wUIXU99lD2ThtL6eLuFOMuxsHICMGHymnGXmleVYg Qa74aWIuWW6Sy5XLCpWzGV3rzgw2M5BplNz2l7owILS32xrbkw713nPjK+MobFaugG Ppf0wkHQYTPKDkYTF9hsbNZIMxzYT2gVQmhkQzEttDwwpKbogmjgpS0xxjjrTwAGiD aB5qreWN5KaHdUPdDN/C1Cnmv/FO/LW4b/1Gr359v3j5x2ycE4oH+Dy0sMBBUQt69K wk+ZYdETNjLFXjjtyaKw7R6nh6tHDhf/Ms3iRL4cvNbtrEeoI5A4XcFPKj7u0AEh2v GFccDlB1DNNnA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 5/5] EVM: use obj-y for non-modular objects Date: Fri, 26 Jul 2019 11:10:58 +0900 Message-Id: <20190726021058.4212-6-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_EVM is a boolean option, so none of these objects is linked into a module. All the objects in this directory are compiled only when CONFIG_EVM=y since this directory is guarded by the parent Makefile: obj-$(CONFIG_EVM) += evm/ So, there is no point in creating the composite object, evm.o Flatten the code into the obj-$(CONFIG_...) form. Signed-off-by: Masahiro Yamada --- security/integrity/evm/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/security/integrity/evm/Makefile b/security/integrity/evm/Makefile index a56f5613be79..ace8e4ef5a96 100644 --- a/security/integrity/evm/Makefile +++ b/security/integrity/evm/Makefile @@ -2,7 +2,5 @@ # # Makefile for building the Extended Verification Module(EVM) # -obj-$(CONFIG_EVM) += evm.o - -evm-y := evm_main.o evm_crypto.o evm_secfs.o -evm-$(CONFIG_FS_POSIX_ACL) += evm_posix_acl.o +obj-y := evm_main.o evm_crypto.o evm_secfs.o +obj-$(CONFIG_FS_POSIX_ACL) += evm_posix_acl.o