nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

sysctl: drop now unnecessary out-of-bounds check

Browse source 
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>
This commit is contained in:
Thomas Weißschuh 2024-03-22 18:05:58 +01:00 committed by Joel Granados
parent 4a7b29f650
commit a35dd3a786
1 changed files with 2 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
fs/proc/proc_sysctl.c
View file

@ -30,9 +30,7 @@ static const struct file_operations proc_sys_dir_file_operations;
static const struct inode_operations proc_sys_dir_operations; static const struct inode_operations proc_sys_dir_operations;
/* Support for permanently empty directories */ /* 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 * 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; return -EROFS;
/* Am I creating a permanently empty directory? */ /* Am I creating a permanently empty directory? */
if (header->ctl_table_size > 0 && if (sysctl_is_perm_empty_ctl_header(header)) {
sysctl_is_perm_empty_ctl_header(header)) {
if (!RB_EMPTY_ROOT(&dir->root)) if (!RB_EMPTY_ROOT(&dir->root))
return -EINVAL; return -EINVAL;
sysctl_set_perm_empty_ctl_header(dir_h); sysctl_set_perm_empty_ctl_header(dir_h);