diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2024-03-22 18:05:58 +0100 |
|---|---|---|
| committer | Joel Granados <j.granados@samsung.com> | 2024-04-24 09:43:54 +0200 |
| commit | a35dd3a786f57903151b18275b1eed105084cf72 (patch) | |
| tree | 7a76594562b456a1337384a2281a396a4578c6c1 | |
| parent | 4a7b29f6509470a7e63dd67e516268fbef226194 (diff) | |
| download | sysctl-next.tar.gz | |
sysctl: drop now unnecessary out-of-bounds checksysctl-6.10-rc1sysctl-next
Remove the now unneeded check for ctl_table_size; it is safe
to do so as sysctl_set_perm_empty_ctl_header() does not access the
ctl_table member anymore.
This also makes the element of sysctl_mount_point unnecessary, so drop
it at the same time.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Joel Granados <j.granados@samsung.com>
| -rw-r--r-- | fs/proc/proc_sysctl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index a847b0bc63c457..b1c2c0b821161f 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -30,9 +30,7 @@ static const struct file_operations proc_sys_dir_file_operations; static const struct inode_operations proc_sys_dir_operations; /* Support for permanently empty directories */ -static struct ctl_table sysctl_mount_point[] = { - { } -}; +static struct ctl_table sysctl_mount_point[] = { }; /** * register_sysctl_mount_point() - registers a sysctl mount point @@ -232,8 +230,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); |