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/