proc oops fix

GIT PULL Eric W. Biederman 1 participant 1 message Jun 16, 2011 Proc filesystem

lore

Share & tools

lore

Eric W. Biederman

author

2011-06-16 21:07 UTC #0 lore raw

Linus please pull.

git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git

This prevents a much too easily triggered oops.

Eric

Quoted 1 line

From 793925334f32e9026c22baee5c3c340f47d4ef7e Mon Sep 17 00:00:00 2001

From: "Eric W. Biederman" <[email protected]>
Date: Wed, 15 Jun 2011 12:47:04 -0700
Subject: [PATCH] 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 <[email protected]>

Signed-off-by Eric W. Biederman <[email protected]>

---
 fs/proc/namespaces.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

fs/proc/namespaces.c +6 -3

index 781dec5..be177f7 100644
@@ -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);

Signature · 1 line

1.7.5.1.217.g4e3aa