leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysctl: Correct error return from get_subdir

Browse Source 
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: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-01-30 20:37:51 -08:00
parent 51f72f4a0f
commit 0eb97f38d2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/proc/proc_sysctl.c
View File

@ -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: