lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

proc: Fix Oops on stat of /proc/<zombie pid>/ns/net

Browse Source 
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>
This commit is contained in:
Eric W. Biederman
2011-06-15 12:47:04 -07:00
parent 2c53b436a3
commit 793925334f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/proc/namespaces.c
View File

@@ -38,18 +38,21 @@ static struct dentry *proc_ns_instantiate(struct inode *dir,
struct inode *inode; struct inode *inode;
struct proc_inode *ei; struct proc_inode *ei;
struct dentry *error = ERR_PTR(-ENOENT); struct dentry *error = ERR_PTR(-ENOENT);
void *ns;
inode = proc_pid_make_inode(dir->i_sb, task); inode = proc_pid_make_inode(dir->i_sb, task);
if (!inode) if (!inode)
goto out; goto out;
ns = ns_ops->get(task);
if (!ns)
goto out_iput;
ei = PROC_I(inode); ei = PROC_I(inode);
inode->i_mode = S_IFREG|S_IRUSR; inode->i_mode = S_IFREG|S_IRUSR;
inode->i_fop = &ns_file_operations; inode->i_fop = &ns_file_operations;
ei->ns_ops = ns_ops; ei->ns_ops = ns_ops;
ei->ns = ns_ops->get(task); ei->ns = ns;
if (!ei->ns)
goto out_iput;
dentry->d_op = &pid_dentry_operations; dentry->d_op = &pid_dentry_operations;
d_add(dentry, inode); d_add(dentry, inode);