aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-01-30 23:37:51 -0500
committerEric W. Biederman <ebiederm@xmission.com>2012-02-01 22:20:40 -0500
commit0eb97f38d2bfaea289b44c5140a7b04e7b369bad (patch)
treee9d0d1ae9ec236f32da3642723111c86c80d530a
parent51f72f4a0f92e4abde33a8bca0fac9667575d035 (diff)
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: Lucian Adrian Grijincu <lucian.grijincu@gmail.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--fs/proc/proc_sysctl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index ebe8b3076db7..722ec116208d 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -869,6 +869,7 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir,
869{ 869{
870 struct ctl_table_set *set = dir->header.set; 870 struct ctl_table_set *set = dir->header.set;
871 struct ctl_dir *subdir, *new = NULL; 871 struct ctl_dir *subdir, *new = NULL;
872 int err;
872 873
873 spin_lock(&sysctl_lock); 874 spin_lock(&sysctl_lock);
874 subdir = find_subdir(dir, name, namelen); 875 subdir = find_subdir(dir, name, namelen);
@@ -890,7 +891,9 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir,
890 if (PTR_ERR(subdir) != -ENOENT) 891 if (PTR_ERR(subdir) != -ENOENT)
891 goto failed; 892 goto failed;
892 893
893 if (insert_header(dir, &new->header)) 894 err = insert_header(dir, &new->header);
895 subdir = ERR_PTR(err);
896 if (err)
894 goto failed; 897 goto failed;
895 subdir = new; 898 subdir = new;
896found: 899found: