From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCBF3C43382 for ; Tue, 25 Sep 2018 00:18:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74D212098A for ; Tue, 25 Sep 2018 00:18:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UpIzsCl5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 74D212098A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728434AbeIYGX2 (ORCPT ); Tue, 25 Sep 2018 02:23:28 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:36514 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728126AbeIYGX1 (ORCPT ); Tue, 25 Sep 2018 02:23:27 -0400 Received: by mail-pf1-f195.google.com with SMTP id b7-v6so2503022pfo.3 for ; Mon, 24 Sep 2018 17:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SJSMq1IylsdmDC6tKe2QXG4rx4NTxkWXmcEscNNPrNQ=; b=UpIzsCl5FvnGIXOYOS5hU7C0YL8/S4Y7+Iu2kiG/v6so5wwTQXrzw35wrpyCpEL897 sxUfG0q2+0cUvDcYRWkPSiOyVJk4YQGr/pZwOUo4ipAp+aFACSLSOnU3azlAGxzkPNj7 mpW7AWWrtVaksxrjiVZSpG+Ewns9rmBDjgwRg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SJSMq1IylsdmDC6tKe2QXG4rx4NTxkWXmcEscNNPrNQ=; b=ostRI9zNiB7edK+3aJwyctCQ6ZiQhi3KS4ZdySSTeRlJHOtI8T7l2BnYGD3DPY8V2Z /B9CWCnjc1CFZXUpg0dcEvx4b64THAea5qz4YNz+j7xhH1Z9WX6MpH7OTHesVcOA1cbe PPp7vfVDpwbmO99VPMjqpm96cSeezxgYcK7EmncnvRkJh8mLqYBxWY5sEU02KJ5q++L9 O6kMvER15WRH/4qUipk2lDEC0dkWFM6LUCkoHuVwOPr3ykRrCN0svjwCgOamvGXNzP+0 ByA3MK2vr0epzHq69tnHTBmvwUh9MhOgiFTDnRceZAw/UOVVFaG3ncey6I43mmPG39C2 GvCQ== X-Gm-Message-State: ABuFfoj0AnHUcYJxG1HllSDGAMq8O2zAiT1CSemwKjfWpmlGZsjjB567 D+JilJ6mAxOtqenXmJRlyt4Vog== X-Google-Smtp-Source: ACcGV61mKHO+aF35FoDAEPJrqFH6Bd/hDjOvjLpCfYhZZWXD+Oz2LX6VxlVxJzxlp3g7CAigQgdZPw== X-Received: by 2002:a17:902:6b44:: with SMTP id g4-v6mr1002294plt.50.1537834722042; Mon, 24 Sep 2018 17:18:42 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id h82-v6sm549378pfa.173.2018.09.24.17.18.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Sep 2018 17:18:37 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Arnd Bergmann , linux-arch@vger.kernel.org, Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v3 02/29] vmlinux.lds.h: Avoid copy/paste of security_init section Date: Mon, 24 Sep 2018 17:18:05 -0700 Message-Id: <20180925001832.18322-3-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> References: <20180925001832.18322-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid copy/paste by defining SECURITY_INIT in terms of SECURITY_INITCALL. Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Signed-off-by: Kees Cook --- include/asm-generic/vmlinux.lds.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 7b75ff6e2fce..934a45395547 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -473,13 +473,6 @@ #define RODATA RO_DATA_SECTION(4096) #define RO_DATA(align) RO_DATA_SECTION(align) -#define SECURITY_INIT \ - .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \ - __security_initcall_start = .; \ - KEEP(*(.security_initcall.init)) \ - __security_initcall_end = .; \ - } - /* * .text section. Map to function alignment to avoid address changes * during second ld run in second ld pass when generating System.map @@ -798,6 +791,12 @@ KEEP(*(.security_initcall.init)) \ __security_initcall_end = .; +/* Older linker script style for security init. */ +#define SECURITY_INIT \ + .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \ + SECURITY_INITCALL \ + } + #ifdef CONFIG_BLK_DEV_INITRD #define INIT_RAM_FS \ . = ALIGN(4); \ -- 2.17.1