summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 14:38:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 14:38:21 -0700
commit3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a (patch)
tree1d6be67bfc1175333279da5934805be3921182b0
parentdc6f962eb5ad728086fcfa9967976e93ed68e0a5 (diff)
parent8f587df479c3cea14ba1a9b9d58f34fd2fd6d58b (diff)
downloadop-kernel-dev-3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a.zip
op-kernel-dev-3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a.tar.gz
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
-rw-r--r--fs/9p/fid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index 3585636..6406f89 100644
--- 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;
OpenPOWER on IntegriCloud