sysctl: drop now unnecessary out-of-bounds check
authorThomas Weißschuh <linux@weissschuh.net>
Fri, 22 Mar 2024 17:05:58 +0000 (18:05 +0100)
committerJoel Granados <j.granados@samsung.com>
Wed, 24 Apr 2024 07:43:54 +0000 (09:43 +0200)
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>
fs/proc/proc_sysctl.c

index a847b0bc63c457bad7b4a7966b9983787be21eca..b1c2c0b821161f158d8b24df1b5806886508c313 100644 (file)
@@ -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);