lkml.org 
[lkml]   [2012]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/4] sysctl: Correct error return from get_subdir
Date

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>
---
fs/proc/proc_sysctl.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index ebe8b30..722ec11 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,
{
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:
--
1.7.2.5


\
 
 \ /
  Last update: 2012-02-02 04:29    [from the cache]
©2003-2011 Jasper Spaans