Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: potential ERR_PTR() dereference
mariux64 · Sep 7, 2010 · 3c5dff7 · 3c5dff7
2 parents dc6f962 + 8f587df
commit 3c5dff7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
@@ -242,7 +242,8 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
 	}
 	kfree(wnames);
 fid_out:
-	v9fs_fid_add(dentry, fid);
+	if (!IS_ERR(fid))
+		v9fs_fid_add(dentry, fid);
 err_out:
 	up_read(&v9ses->rename_sem);
 	return fid;