diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 20:09:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 20:09:15 -0700 |
commit | 36698206504fca9198b8563f1fc2c9e38e063e11 (patch) | |
tree | f02b63c9b35a7962786b5dcdb1af15a63f5de1cf /fs/ubifs/super.c | |
parent | ef46222e7b56e728e423527d430cb2013c595491 (diff) | |
parent | 482e0cd3dbaa70f2a2bead4b5f2c0d203ef654ba (diff) | |
download | op-kernel-dev-36698206504fca9198b8563f1fc2c9e38e063e11.zip op-kernel-dev-36698206504fca9198b8563f1fc2c9e38e063e11.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
devcgroup_inode_permission: take "is it a device node" checks to inlined wrapper
fix comment in generic_permission()
kill obsolete comment for follow_down()
proc_sys_permission() is OK in RCU mode
reiserfs_permission() doesn't need to bail out in RCU mode
proc_fd_permission() is doesn't need to bail out in RCU mode
nilfs2_permission() doesn't need to bail out in RCU mode
logfs doesn't need ->permission() at all
coda_ioctl_permission() is safe in RCU mode
cifs_permission() doesn't need to bail out in RCU mode
bad_inode_permission() is safe from RCU mode
ubifs: dereferencing an ERR_PTR in ubifs_mount()
Diffstat (limited to 'fs/ubifs/super.c')
-rw-r--r-- | fs/ubifs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 8c892c2..529be05 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2146,6 +2146,7 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags, if (IS_ERR(sb)) { err = PTR_ERR(sb); kfree(c); + goto out_close; } if (sb->s_root) { |