From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (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 D931231DDBD for ; Tue, 2 Sep 2025 18:20:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756837225; cv=none; b=OgpKg2w3MuzyGT7GXpzeB4rF76rYpb1fLCdQjMNiRD1SCQSIGHu5yheib/+oy1MZVT5k2bOx7QueN3I84OLJaqmS0xuXnOrXWIswg3Wlu6CkhoMlFCTnF9NE/d1slJigtugs23a/kK69hidYVSubYrmtka0xrT50rtvZ/8bYB54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756837225; c=relaxed/simple; bh=3KBBQEXp1j2SUecge6Vg1ut0WIqcmHxhVYmH8pKx/O0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=N/pnEK5UOMrydIGCsSjFAw/amg32981DSs06nWviaFLlpUiFgc8pqRg7eqBJAwBrNAjjWgZUjrNVQPWLno2qH7Pt2jZfYQqxu5tzu33Lq0ng1kyER/OO9wBXJTu1bHgybvlZFsVaRk7t12ewSDhOeIqpGvNc1/fiUq//6kqduo0= 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=OWB8gLDc; arc=none smtp.client-ip=185.125.188.123 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="OWB8gLDc" Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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-internal-1.canonical.com (Postfix) with ESMTPS id 92C4D3F284 for ; Tue, 2 Sep 2025 18:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1756837221; bh=S029MEGT5TSIi/OkV9SSMnt5iIRR8VzURXAohDvFhBg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=OWB8gLDc8WEfWCe/LgyJRe0+Jo+SUI1SY7zQ+naLVtKOMZ933ErbVSKf4dlsZi1O2 9OFSo+xb/lUWEi3R4nCh0a/Z3phMXaTv82aXIiKT3BgpnqkwuHQ2LgaNS/rU/W/Ap4 UZvlHKIkz9RrVjGvDWdon+Zwo/81CD1XSQpEiG2U7OsSEolKoYQ2g5tZFTAe928FCL bQKTqcg/8IfNybIfyJ7xZb+/2yKh6Cj2wKzgL11FUECg4w3Oxxq8mnSSOE7dhK5kDm OuqlMqBSttzofezM8lDQKJZiDu8q2QsM9OOTJilikBIa27wO3b1AeW2asNXpxlKi9j xnj8HKwgxoObg== Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-24a9de13b7eso35611845ad.0 for ; Tue, 02 Sep 2025 11:20:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756837220; x=1757442020; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S029MEGT5TSIi/OkV9SSMnt5iIRR8VzURXAohDvFhBg=; b=l//rHHog9GcAj7FdBk13hhl7H45n8Jk+1bo6t13yq0xdhU1juEN4dKLukZrCiGiNPt 2sHKpxEwMFGMqjiYLx66KeMAHciUIvlSamFz/UuqdTZkOTvAJ5Nb32q9nvW4haCl+QHq /pG2yhT0AFbMhdunsz2frlKQs/eJlH80fa1F6W0OSqM1q9MduFe8LPhOFOLAQT+1urKD jyXcG3oXYzIaXIr/p2XSxmbZYlZMqQWELqpFxz31gr261MagTJ3ifo+nurWR0BGj5BBq 6K1ZvdWZ/D7UM5reZ15CafTvL+W1RtXEEBAJtYXt/3L6q+kADly6Dpy6712Hq8hoSmqc OoAg== X-Forwarded-Encrypted: i=1; AJvYcCXK+qP96wRq3JsGs2WUn16VKx9V7lfOM5JpYR60Ds1vwqtheXTY87xRATmMrE5O5aOIn+mWHKHEBMgg8p+HVLX9WADBWCY=@vger.kernel.org X-Gm-Message-State: AOJu0YyWGPmvltCr5rKZmQJL8/Pt7sIHW2zwaMUro7e8IYSWRMbwz9p3 3KqeanwHZXMpnz0Ck0jBzfTQdWePPiWHMbk2wrXASei8FivTpYag8T+FKgJDXx/Mkd5fmTnkCHj qes3vM7JsRJcbj/qU5BoAstgsUGyBAsRgf1mDG5Mx17AiqJDL0qYg4IjC1LF7m/d+q6qt6vNBir ZX9LpjReZcTVYXfh5wmA== X-Gm-Gg: ASbGncv3RS1k18/7mt+dzereJuEeDnFAD2bLaQUmm7hY5AcMpKkuEyfMJ4lwr8FBDNd XC3pEykM0zje4mGenom9Gh0ahCCv28yudzfktlej+74tQInJi5rIH9VurmfK8ZIXDaRWqYAjxY5 mFE9/QRPtXNySvIdHk1uruZdG0Mn8tFnspTkJKr3rE6jE/oDtAjV8HglH4mhdnwB0qadR7YEhma e+OW52zZOKF2DbSUHav0lS7a0tFnK30VrNOEDKl8jCfXJLQJEvkwVMuIz5SMd/n7rUbHuHhhiuY Is0UJ+WttDFjp7bPSP3j06ellOd75/BzaDpPMJqzC0Quyr+jl2rNNQ== X-Received: by 2002:a17:903:41d0:b0:249:27b9:2a06 with SMTP id d9443c01a7336-2494488a758mr174465715ad.2.1756837220012; Tue, 02 Sep 2025 11:20:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+EckhCuZ4GrS0CI5mr4WL8iciCvCMGF84eY8IDYjRhJGB4SQ097kgD6id6n31fkyvBsZQxg== X-Received: by 2002:a17:903:41d0:b0:249:27b9:2a06 with SMTP id d9443c01a7336-2494488a758mr174465435ad.2.1756837219567; Tue, 02 Sep 2025 11:20:19 -0700 (PDT) Received: from [192.168.192.85] ([50.47.129.42]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-249065b7413sm136066355ad.132.2025.09.02.11.20.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Sep 2025 11:20:18 -0700 (PDT) Message-ID: Date: Tue, 2 Sep 2025 11:20:18 -0700 Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 33/34] 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 , Nicolas Bouchinet , Xiu Jianfeng References: <20250814225159.275901-36-paul@paul-moore.com> <20250814225159.275901-69-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: <20250814225159.275901-69-paul@paul-moore.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/14/25 15:50, Paul Moore wrote: > The LSM framework itself registers a small number of initcalls, this > patch converts these initcalls into the new initcall mechanism. > > Reviewed-by: Casey Schaufler > 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 a5e7a073e672..21b1f9b4d396 100644 > --- a/security/inode.c > +++ b/security/inode.c > @@ -384,7 +384,7 @@ static const struct file_operations lsm_ops = { > }; > #endif > > -static int __init securityfs_init(void) > +int __init securityfs_init(void) > { > int retval; > > @@ -403,4 +403,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 8dc267977ae0..436219260376 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 697482a22a02..2bd705836df8 100644 > --- a/security/lsm_init.c > +++ b/security/lsm_init.c > @@ -488,7 +488,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); > > @@ -506,7 +511,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);