| commit | 3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:38:21 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:38:21 2010 -0700 |
| tree | 1d6be67bfc1175333279da5934805be3921182b0 | |
| parent | dc6f962eb5ad728086fcfa9967976e93ed68e0a5 [diff] | |
| parent | 8f587df479c3cea14ba1a9b9d58f34fd2fd6d58b [diff] |
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
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 @@ } 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;