From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B01C27B4E8; Wed, 14 May 2025 13:38:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.120 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747229895; cv=none; b=S0wnAiMfarKLcpyX0jhX5fPFKY7FreQBGhuxuJwo/Zts1g2TZevAEvsAR5Q9OCzq38r16XLuOI7z48Hl0ONmGElCneJpWHCbfNIqwTigbU08nrhfTjfL5jD6Qbsx8nIf0Azd6s6s7IUY1fVGys8rzbIWmcerTSP6zhsLb11uGA0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747229895; c=relaxed/simple; bh=o3LsO+g2897GbpTeAT5y8eM5yrDtFj2KTZlDX1VGDq8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SIDcx0l2DQLIO21AnAaLxMCjnBuBM3MwHOaY712DFG9LASU29oGvwJ6Lqhdm7bK+IZXWL7AlFsD9XXyETVBjPGv2Ul4vdKLVo+j2H4Ck0SVGinKLTYq5OUOLE0wBM7sZ5QUnKnNrWoAMiOhkQWAwRVi05SCTSHN1vV9Hl1eoJqA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=dLgQb+zz; arc=none smtp.client-ip=185.125.188.120 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="dLgQb+zz" Received: from [172.20.3.254] (unknown [213.157.19.135]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 314D83F187; Wed, 14 May 2025 13:38:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1747229891; bh=7kdLM6Tjwe9+dX+balOpcfDsbypsxvoqvoy9qesmYoE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=dLgQb+zzbXQiQ38T9MT6pNvmtKV66+48MGQnm3mUOadaXC2PwZt6v2IHfoteXgNrS 0Re9Mru0G8n1D3Uiqs/5MMFx+RK2j0Lb5ZReq9gLF7cucesDkseGPVTS8c1eYLZZdT izZhgy9ODo/ObdOgFQGHYu2/Xca14MTu8zxCXBMxMMX+yXj/YfBoXrrsHboZ9pXBva jtjDawgIpdUkACfjcOG6xEURPziO9iMhJ3OCgKQ20T1HmsMr+EUE4rn+/VP4HxZm7L 7GkCDCyODvs74pDK8qliMuht1j9YtBIvUk1Tu1BIduwPHb9F9L7YOF4yCvNq/kd6m4 s16n+MM9ZoxWQ== Message-ID: <3d7515a8-473e-4cb4-9e14-a1dc9f04e32e@canonical.com> Date: Wed, 14 May 2025 06:38:09 -0700 Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH 27/29] lsm: consolidate all of the LSM framework initcalls To: Paul Moore , linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org Cc: Mimi Zohar , Roberto Sassu , Fan Wu , =?UTF-8?Q?Micka=C3=ABl_Sala=C3=BCn?= , =?UTF-8?Q?G=C3=BCnther_Noack?= , Kees Cook , Micah Morton , Casey Schaufler , Tetsuo Handa References: <20250409185019.238841-31-paul@paul-moore.com> <20250409185019.238841-58-paul@paul-moore.com> Content-Language: en-US From: John Johansen Autocrypt: addr=john.johansen@canonical.com; keydata= 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 lT9Q Organization: Canonical In-Reply-To: <20250409185019.238841-58-paul@paul-moore.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/9/25 11:50, Paul Moore wrote: > The LSM framework itself registers a small number of initcalls, this > patch converts these initcalls into the new initcall mechanism. > > Signed-off-by: Paul Moore Reviewed-by: John Johansen > --- > security/inode.c | 3 +-- > security/lsm.h | 4 ++++ > security/lsm_init.c | 14 ++++++++++++-- > security/min_addr.c | 5 +++-- > 4 files changed, 20 insertions(+), 6 deletions(-) > > diff --git a/security/inode.c b/security/inode.c > index f687e22e6809..671c66c147bc 100644 > --- a/security/inode.c > +++ b/security/inode.c > @@ -375,7 +375,7 @@ static const struct file_operations lsm_ops = { > }; > #endif > > -static int __init securityfs_init(void) > +int __init securityfs_init(void) > { > int retval; > > @@ -394,4 +394,3 @@ static int __init securityfs_init(void) > #endif > return 0; > } > -core_initcall(securityfs_init); > diff --git a/security/lsm.h b/security/lsm.h > index 8ecb66896646..c432dc0c5e30 100644 > --- a/security/lsm.h > +++ b/security/lsm.h > @@ -35,4 +35,8 @@ extern struct kmem_cache *lsm_inode_cache; > int lsm_cred_alloc(struct cred *cred, gfp_t gfp); > int lsm_task_alloc(struct task_struct *task); > > +/* LSM framework initializers */ > +int securityfs_init(void); > +int min_addr_init(void); > + > #endif /* _LSM_H_ */ > diff --git a/security/lsm_init.c b/security/lsm_init.c > index 75eb0cc82869..c0881407ca3f 100644 > --- a/security/lsm_init.c > +++ b/security/lsm_init.c > @@ -485,7 +485,12 @@ int __init security_init(void) > */ > static int __init security_initcall_pure(void) > { > - return lsm_initcall(pure); > + int rc_adr, rc_lsm; > + > + rc_adr = min_addr_init(); > + rc_lsm = lsm_initcall(pure); > + > + return (rc_adr ? rc_adr : rc_lsm); > } > pure_initcall(security_initcall_pure); > > @@ -503,7 +508,12 @@ early_initcall(security_initcall_early); > */ > static int __init security_initcall_core(void) > { > - return lsm_initcall(core); > + int rc_sfs, rc_lsm; > + > + rc_sfs = securityfs_init(); > + rc_lsm = lsm_initcall(core); > + > + return (rc_sfs ? rc_sfs : rc_lsm); > } > core_initcall(security_initcall_core); > > diff --git a/security/min_addr.c b/security/min_addr.c > index df1bc643d886..40714bdeefbe 100644 > --- a/security/min_addr.c > +++ b/security/min_addr.c > @@ -4,6 +4,8 @@ > #include > #include > > +#include "lsm.h" > + > /* amount of vm to protect from userspace access by both DAC and the LSM*/ > unsigned long mmap_min_addr; > /* amount of vm to protect from userspace using CAP_SYS_RAWIO (DAC) */ > @@ -54,11 +56,10 @@ static const struct ctl_table min_addr_sysctl_table[] = { > }, > }; > > -static int __init init_mmap_min_addr(void) > +int __init min_addr_init(void) > { > register_sysctl_init("vm", min_addr_sysctl_table); > update_mmap_min_addr(); > > return 0; > } > -pure_initcall(init_mmap_min_addr);