diff --git a/[refs] b/[refs] index 845591fb2024..2519a586ec7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb875b38dc5e343bdb696b2eab8233e4d195e208 +refs/heads/master: 3ddf1e7f57237ac7c5d5bfb7058f1ea4f970b661 diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c index 47c96fdca1ac..6893717b6536 100644 --- a/trunk/fs/fuse/inode.c +++ b/trunk/fs/fuse/inode.c @@ -829,15 +829,20 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) if (!file) return -EINVAL; - if (file->f_op != &fuse_dev_operations) + if (file->f_op != &fuse_dev_operations) { + fput(file); return -EINVAL; + } fc = kmalloc(sizeof(*fc), GFP_KERNEL); - if (!fc) + if (!fc) { + fput(file); return -ENOMEM; + } err = fuse_conn_init(fc, sb); if (err) { + fput(file); kfree(fc); return err; }