Commit 3c5dff7b authored by Linus Torvalds's avatar Linus Torvalds

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
parents dc6f962e 8f587df4
...@@ -242,7 +242,8 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) ...@@ -242,7 +242,8 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
} }
kfree(wnames); kfree(wnames);
fid_out: fid_out:
v9fs_fid_add(dentry, fid); if (!IS_ERR(fid))
v9fs_fid_add(dentry, fid);
err_out: err_out:
up_read(&v9ses->rename_sem); up_read(&v9ses->rename_sem);
return fid; return fid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment