Commit a35dd3a7 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Joel Granados
Browse files

sysctl: drop now unnecessary out-of-bounds check 



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: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarJoel Granados <j.granados@samsung.com>
parent 4a7b29f6

fs/proc/proc_sysctl.c

+2 −5
Original line number Diff line number Diff line
@@ -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);