From: Georgia Garcia <georgia.garcia@canonical.com>
To: Luis Chamberlain <mcgrof@kernel.org>,
ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com,
john.johansen@canonical.com, paul@paul-moore.com,
jmorris@namei.org, serge@hallyn.com, luto@amacapital.net,
wad@chromium.org, dverkamp@chromium.org, paulmck@kernel.org,
baihaowen@meizu.com, frederic@kernel.org, jeffxu@google.com,
ebiggers@kernel.org, tytso@mit.edu, guoren@kernel.org
Cc: j.granados@samsung.com, zhangpeng362@huawei.com,
tangmeng@uniontech.com, willy@infradead.org,
nixiaoming@huawei.com, sujiaxun@uniontech.com,
patches@lists.linux.dev, linux-fsdevel@vger.kernel.org,
apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org,
linux-csky@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 04/11] apparmor: simplify sysctls with register_sysctl_init()
Date: Thu, 02 Mar 2023 17:42:07 -0300 [thread overview]
Message-ID: <c010472791aa57c8ea838b5e85780f5be98898d5.camel@canonical.com> (raw)
In-Reply-To: <20230302202826.776286-5-mcgrof@kernel.org>
On Thu, 2023-03-02 at 12:28 -0800, Luis Chamberlain wrote:
> Using register_sysctl_paths() is really only needed if you have
> subdirectories with entries. We can use the simple register_sysctl()
> instead.
>
> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
> ---
> security/apparmor/lsm.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> index d6cc4812ca53..47c7ec7e5a80 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -1764,11 +1764,6 @@ static int apparmor_dointvec(struct ctl_table *table, int write,
> return proc_dointvec(table, write, buffer, lenp, ppos);
> }
>
> -static struct ctl_path apparmor_sysctl_path[] = {
> - { .procname = "kernel", },
> - { }
> -};
> -
> static struct ctl_table apparmor_sysctl_table[] = {
> {
> .procname = "unprivileged_userns_apparmor_policy",
> @@ -1790,8 +1785,7 @@ static struct ctl_table apparmor_sysctl_table[] = {
>
> static int __init apparmor_init_sysctl(void)
> {
> - return register_sysctl_paths(apparmor_sysctl_path,
> - apparmor_sysctl_table) ? 0 : -ENOMEM;
> + return register_sysctl("kernel", apparmor_sysctl_table) ? 0 : -ENOMEM;
> }
> #else
> static inline int apparmor_init_sysctl(void)
Reviewed-by: Georgia Garcia <georgia.garcia@canonical.com>
next prev parent reply other threads:[~2023-03-02 20:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 20:28 [PATCH 00/11] sysctl: deprecate register_sysctl_paths() Luis Chamberlain
2023-03-02 20:28 ` [PATCH 01/11] proc_sysctl: update docs for __register_sysctl_table() Luis Chamberlain
2023-03-02 20:28 ` [PATCH 02/11] proc_sysctl: move helper which creates required subdirectories Luis Chamberlain
2023-03-02 22:56 ` John Johansen
2023-03-02 20:28 ` [PATCH 03/11] sysctl: clarify register_sysctl_init() base directory order Luis Chamberlain
2023-03-02 20:28 ` [PATCH 04/11] apparmor: simplify sysctls with register_sysctl_init() Luis Chamberlain
2023-03-02 20:42 ` Georgia Garcia [this message]
2023-03-02 22:51 ` John Johansen
2023-03-02 20:28 ` [PATCH 05/11] loadpin: simplify sysctls use with register_sysctl() Luis Chamberlain
2023-03-02 22:56 ` Kees Cook
2023-03-02 22:58 ` John Johansen
2023-03-02 20:28 ` [PATCH 06/11] yama: simplfy sysctls " Luis Chamberlain
2023-03-02 22:56 ` Kees Cook
2023-03-02 20:28 ` [PATCH 07/11] seccomp: simplify sysctls with register_sysctl_init() Luis Chamberlain
2023-03-02 22:56 ` Kees Cook
2023-03-02 20:28 ` [PATCH 08/11] kernel: pid_namespace: simplify sysctls with register_sysctl() Luis Chamberlain
2023-03-02 23:13 ` Jeff Xu
2023-03-09 22:11 ` Luis Chamberlain
2023-03-09 22:27 ` Andrew Morton
2023-03-19 20:47 ` Luis Chamberlain
2023-03-10 4:14 ` Eric Biggers
2023-03-10 7:00 ` Luis Chamberlain
2023-03-02 20:28 ` [PATCH 09/11] fs-verity: " Luis Chamberlain
2023-03-07 19:47 ` Eric Biggers
2023-03-02 20:28 ` [PATCH 10/11] csky: simplify alignment sysctl registration Luis Chamberlain
2023-03-02 20:28 ` [PATCH 11/11] proc_sysctl: deprecate register_sysctl_paths() Luis Chamberlain
2023-03-10 4:17 ` Eric Biggers
2023-03-10 7:01 ` Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c010472791aa57c8ea838b5e85780f5be98898d5.camel@canonical.com \
--to=georgia.garcia@canonical.com \
--cc=apparmor@lists.ubuntu.com \
--cc=baihaowen@meizu.com \
--cc=dverkamp@chromium.org \
--cc=ebiederm@xmission.com \
--cc=ebiggers@kernel.org \
--cc=frederic@kernel.org \
--cc=guoren@kernel.org \
--cc=j.granados@samsung.com \
--cc=jeffxu@google.com \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=keescook@chromium.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mcgrof@kernel.org \
--cc=nixiaoming@huawei.com \
--cc=patches@lists.linux.dev \
--cc=paul@paul-moore.com \
--cc=paulmck@kernel.org \
--cc=serge@hallyn.com \
--cc=sujiaxun@uniontech.com \
--cc=tangmeng@uniontech.com \
--cc=tytso@mit.edu \
--cc=wad@chromium.org \
--cc=willy@infradead.org \
--cc=yzaikin@google.com \
--cc=zhangpeng362@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).