From: "Thomas Weißschuh" <linux@weissschuh.net>
To: "Eric W. Biederman" <ebiederm@xmission.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Kees Cook <keescook@chromium.org>,
Joel Granados <j.granados@samsung.com>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
"Thomas Weißschuh" <linux@weissschuh.net>
Subject: [PATCH 3/4] sysctl: drop now unnecessary out-of-bounds check
Date: Thu, 22 Feb 2024 08:07:38 +0100 [thread overview]
Message-ID: <20240222-sysctl-empty-dir-v1-3-45ba9a6352e8@weissschuh.net> (raw)
In-Reply-To: <20240222-sysctl-empty-dir-v1-0-45ba9a6352e8@weissschuh.net>
The type field is now part of the header so
sysctl_is_perm_empty_ctl_header() can safely be executed even without
any ctl_tables.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
fs/proc/proc_sysctl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index fde7a2f773f0..4cdf98c6a9a4 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -232,8 +232,7 @@ static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header)
return -EROFS;
/* Am I creating a permanently empty directory? */
- if (header->ctl_table_size > 0 &&
- sysctl_is_perm_empty_ctl_header(header)) {
+ if (sysctl_is_perm_empty_ctl_header(header)) {
if (!RB_EMPTY_ROOT(&dir->root))
return -EINVAL;
sysctl_set_perm_empty_ctl_header(dir_h);
--
2.43.2
next prev parent reply other threads:[~2024-02-22 7:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 7:07 [PATCH 0/4] sysctl: move sysctl type to ctl_table_header Thomas Weißschuh
2024-02-22 7:07 ` [PATCH 1/4] sysctl: drop sysctl_is_perm_empty_ctl_table Thomas Weißschuh
2024-03-19 15:44 ` Joel Granados
2024-02-22 7:07 ` [PATCH 2/4] sysctl: move sysctl type to ctl_table_header Thomas Weißschuh
2024-03-19 15:43 ` Joel Granados
2024-02-22 7:07 ` Thomas Weißschuh [this message]
2024-03-19 15:27 ` [PATCH 3/4] sysctl: drop now unnecessary out-of-bounds check Joel Granados
2024-02-22 7:07 ` [PATCH 4/4] sysctl: remove unnecessary sentinel element Thomas Weißschuh
2024-02-22 16:03 ` [PATCH 0/4] sysctl: move sysctl type to ctl_table_header Luis Chamberlain
[not found] ` <CGME20240319154938eucas1p10dd98f7dd53f3e91793bc8d0f34df1ec@eucas1p1.samsung.com>
2024-03-19 15:49 ` Joel Granados
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=20240222-sysctl-empty-dir-v1-3-45ba9a6352e8@weissschuh.net \
--to=linux@weissschuh.net \
--cc=ebiederm@xmission.com \
--cc=j.granados@samsung.com \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
/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
all inboxes | Powered by JetHome®