Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eb97f38 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

sysctl: Correct error return from get_subdir 



When insert_header fails ensure we return the proper error value
from get_subdir.  In practice nothing cares, but there is no
need to be sloppy.

Reported-by: default avatarLucian Adrian Grijincu <lucian.grijincu@gmail.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 51f72f4a

fs/proc/proc_sysctl.c

+4 −1
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir, 
{

	struct ctl_table_set *set = dir->header.set;

	struct ctl_dir *subdir, *new = NULL;

	int err;



	spin_lock(&sysctl_lock);

	subdir = find_subdir(dir, name, namelen);
@@ -890,7 +891,9 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir, 
	if (PTR_ERR(subdir) != -ENOENT)

		goto failed;



	if (insert_header(dir, &new->header))

	err = insert_header(dir, &new->header);

	subdir = ERR_PTR(err);

	if (err)

		goto failed;

	subdir = new;

found: