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

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

fs/9p/fid.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -242,6 +242,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
	}

	}

	kfree(wnames);

	kfree(wnames);

fid_out:

fid_out:

	if (!IS_ERR(fid))

		v9fs_fid_add(dentry, fid);

		v9fs_fid_add(dentry, fid);

err_out:

err_out:

	up_read(&v9ses->rename_sem);

	up_read(&v9ses->rename_sem);