From patchwork Tue Sep 25 00:18:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10613129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD1C2161F for ; Tue, 25 Sep 2018 00:20:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A87B829E9D for ; Tue, 25 Sep 2018 00:20:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C18529EE6; Tue, 25 Sep 2018 00:20:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 362DE29F53 for ; Tue, 25 Sep 2018 00:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728240AbeIYGX0 (ORCPT ); Tue, 25 Sep 2018 02:23:26 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38347 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728075AbeIYGXZ (ORCPT ); Tue, 25 Sep 2018 02:23:25 -0400 Received: by mail-pg1-f195.google.com with SMTP id r77-v6so4989431pgr.5 for ; Mon, 24 Sep 2018 17:18:39 -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=cNG+Umuz8gpkckvoqmDpsZNoaXz/lpbhmjoKCpcjv4Y=; b=KpGrnpXY7MINlKWpGt5BXbDHO2GvERi8UG+BL1sFeX6+LAlBRvetoUINt4i3bxgoqL SWgN4N8DBij2no/GeUWSrAbmER+zL57BTpEbLEn0l47Lr6tKTDvGudZT57zgRPm3Wh1K tBO+kGXja7DhQ7zYraTVyRyoGc+XsxZSTXb08= 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=cNG+Umuz8gpkckvoqmDpsZNoaXz/lpbhmjoKCpcjv4Y=; b=NxXAIwi5p3JgVUFXxGfk5LaH0Nuq0tBFxFN19zCzRxdyG0ejH4H5tH73N6+dDNsU4/ i2c8Ey/njXQY2KD02+MWgAQSNpByQH1ws9eVoxk+njUrECOdD2rpmsTIKFtB6AT4NsY0 89LU5FNUKfuduck6hOIVz9yxm/n0SxjpJuRgCj2C1k0VRE0+NqxLexkr7UJusU4F4vWW HNuOW8B6q66zh2gVdx8T6r9VmjetpafIdFAcf3uRakLI/JbfKd9CGGoXdB3xIzGlEXz0 XIJ1qM8AzoVsbnhYHStmpHNPNtiD7yn1JOzJ6iRjqRsKNTRdBPZ2qS5Hqb0Qv1Ca1v6d 1JbA== X-Gm-Message-State: ABuFfohhwDzybb6tzguHxHgxrXXI9avemrBmFOmhGfwfi8kF0JuvzTIT FfvZn6WFbq1veamx6bv8mVXImA== X-Google-Smtp-Source: ACcGV61Czj5lcS7tU939B82fcWd1tGZ0LZh2lnxQ0accq1zipJYOa70Q10U4Iahal0QI9rrhzCS1Ng== X-Received: by 2002:a65:4b88:: with SMTP id t8-v6mr909082pgq.239.1537834719316; Mon, 24 Sep 2018 17:18:39 -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 r12-v6sm540112pfh.79.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 , "Serge E. Hallyn" , Ard Biesheuvel , linux-arch@vger.kernel.org, linux-security-module@vger.kernel.org, Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v3 03/29] LSM: Rename .security_initcall section to .lsm_info Date: Mon, 24 Sep 2018 17:18:06 -0700 Message-Id: <20180925001832.18322-4-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: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In preparation for switching from initcall to just a regular set of pointers in a section, rename the internal section name. Cc: Arnd Bergmann Cc: James Morris Cc: "Serge E. Hallyn" Cc: Ard Biesheuvel Cc: linux-arch@vger.kernel.org Cc: linux-security-module@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: James Morris Reviewed-by: John Johansen --- include/asm-generic/vmlinux.lds.h | 10 +++++----- include/linux/init.h | 4 ++-- security/security.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 934a45395547..5079a969e612 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -787,14 +787,14 @@ __con_initcall_end = .; #define SECURITY_INITCALL \ - __security_initcall_start = .; \ - KEEP(*(.security_initcall.init)) \ - __security_initcall_end = .; + __start_lsm_info = .; \ + KEEP(*(.lsm_info.init)) \ + __end_lsm_info = .; /* Older linker script style for security init. */ #define SECURITY_INIT \ - .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \ - SECURITY_INITCALL \ + .lsm_info.init : AT(ADDR(.lsm_info.init) - LOAD_OFFSET) { \ + LSM_INFO \ } #ifdef CONFIG_BLK_DEV_INITRD diff --git a/include/linux/init.h b/include/linux/init.h index 2538d176dd1f..77636539e77c 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -133,7 +133,7 @@ static inline initcall_t initcall_from_entry(initcall_entry_t *entry) #endif extern initcall_entry_t __con_initcall_start[], __con_initcall_end[]; -extern initcall_entry_t __security_initcall_start[], __security_initcall_end[]; +extern initcall_entry_t __start_lsm_info[], __end_lsm_info[]; /* Used for contructor calls. */ typedef void (*ctor_fn_t)(void); @@ -236,7 +236,7 @@ extern bool initcall_debug; static exitcall_t __exitcall_##fn __exit_call = fn #define console_initcall(fn) ___define_initcall(fn,, .con_initcall) -#define security_initcall(fn) ___define_initcall(fn,, .security_initcall) +#define security_initcall(fn) ___define_initcall(fn,, .lsm_info) struct obs_kernel_param { const char *str; diff --git a/security/security.c b/security/security.c index 4cbcf244a965..892fe6b691cf 100644 --- a/security/security.c +++ b/security/security.c @@ -51,9 +51,9 @@ static void __init do_security_initcalls(void) initcall_t call; initcall_entry_t *ce; - ce = __security_initcall_start; + ce = __start_lsm_info; trace_initcall_level("security"); - while (ce < __security_initcall_end) { + while (ce < __end_lsm_info) { call = initcall_from_entry(ce); trace_initcall_start(call); ret = call();