diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2011-06-15 21:47:04 +0200 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2011-06-15 23:35:29 +0200 |
| commit | 793925334f32e9026c22baee5c3c340f47d4ef7e (patch) | |
| tree | 56682059a84cf6ee12b664ac32b42d431f8c4be8 | |
| parent | Linux 3.0-rc3 (diff) | |
| download | linux-793925334f32e9026c22baee5c3c340f47d4ef7e.tar.xz linux-793925334f32e9026c22baee5c3c340f47d4ef7e.zip | |
proc: Fix Oops on stat of /proc/<zombie pid>/ns/net
Don't call iput with the inode half setup to be a namespace filedescriptor.
Instead rearrange the code so that we don't initialize ei->ns_ops until
after I ns_ops->get succeeds, preventing us from invoking ns_ops->put
when ns_ops->get failed.
Reported-by: Ingo Saitz <Ingo.Saitz@stud.uni-hannover.de>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | fs/proc/namespaces.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index 781dec5bd682..be177f702acb 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -38,18 +38,21 @@ static struct dentry *proc_ns_instantiate(struct inode *dir, struct inode *inode; struct proc_inode *ei; struct dentry *error = ERR_PTR(-ENOENT); + void *ns; inode = proc_pid_make_inode(dir->i_sb, task); if (!inode) goto out; + ns = ns_ops->get(task); + if (!ns) + goto out_iput; + ei = PROC_I(inode); inode->i_mode = S_IFREG|S_IRUSR; inode->i_fop = &ns_file_operations; ei->ns_ops = ns_ops; - ei->ns = ns_ops->get(task); - if (!ei->ns) - goto out_iput; + ei->ns = ns; dentry->d_op = &pid_dentry_operations; d_add(dentry, inode); |