From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-6.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id 4244C7D87A for ; Thu, 20 Sep 2018 16:27:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731223AbeITWID (ORCPT ); Thu, 20 Sep 2018 18:08:03 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:40272 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731136AbeITWIC (ORCPT ); Thu, 20 Sep 2018 18:08:02 -0400 Received: by mail-pl1-f194.google.com with SMTP id s17-v6so4582963plp.7 for ; Thu, 20 Sep 2018 09:23:47 -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=Zg+yA6iBpUZzxZCfC7FbRgVPvRB/0N0Ik3Iu+95jWHE=; b=H23tsq1ToF0dxmUZ+HTryRkBaWmjTb71c3wjGIuwxZcwUogcbdfKloN5fXoL0DReiz 6RnBfkuqUS3cXhotka6z/0XQCimbvlLtWXQcmGu0OOKmVKX9EfR2uUPpZLdOVizZ4S0o vN5OYaQjgaj7wy1XGKCtnyMIyvnJi2tka8WR4= 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=Zg+yA6iBpUZzxZCfC7FbRgVPvRB/0N0Ik3Iu+95jWHE=; b=XJw1FXNZwcoBJDpXQVR+J3PlPuerVcNpDwhKisB+gJF1TlZpcIiABr9NLb6HTXLULs Rh7pwGiZjY8v4v8NGGOh9Oci6mn39C49eHf2ScORTsWI+DvjE1WL2b4gW0KngqB4rCiD FfffWph5aIXivS+lNt8IEoD5oCFln8z8P2hPqQgEbrIwv7qmnz/6gJJ6tHOVVccmyb4u rXHJhq6uTJWvlryvJRkYPjZBh/nQb5ArbsIdKwnaz3Hp4NHbW6KUWcudD+Ox965sl+Fg cjiTr3g0+fDhoIPRm8qw83IOubfZdpThTzrGiE5MeH1uDN7lEZ2PMepvC8V5U31uvFV7 RXqw== X-Gm-Message-State: APzg51DAfgsNZRgubpho/xzPfVdL3f8D8adYqUYqDru7HZrF9HwYjEel A+ksDfKhQcoDFVLO9bbtw7b4+w== X-Google-Smtp-Source: ANB0VdbNXm/OIOfuzZqfwwbkUTCJXuevcYNHWasLdUBmfSIo7BtFySaQm1q2bWg7ymD89BrTcDIlww== X-Received: by 2002:a17:902:b78c:: with SMTP id e12-v6mr3044057pls.67.1537460627412; Thu, 20 Sep 2018 09:23:47 -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 a19-v6sm41547245pfj.38.2018.09.20.09.23.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Sep 2018 09:23:43 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , Jonathan Corbet , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v2 02/26] vmlinux.lds.h: Avoid copy/paste of security_init section Date: Thu, 20 Sep 2018 09:23:14 -0700 Message-Id: <20180920162338.21060-3-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> References: <20180920162338.21060-1-keescook@chromium.org> Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Avoid copy/paste by defining SECURITY_INIT in terms of SECURITY_INITCALL. 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