]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
fuse: fix fuse_file_lseek returning with lock held
authorDan Carpenter <error27@gmail.com>
Fri, 27 Mar 2009 10:36:10 +0000 (13:36 +0300)
committerMiklos Szeredi <mszeredi@suse.cz>
Mon, 30 Mar 2009 15:26:24 +0000 (17:26 +0200)
This bug was found with smatch (http://repo.or.cz/w/smatch.git/).  If
we return directly the inode->i_mutex lock doesn't get released.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: stable@kernel.org
fs/fuse/file.c

index d9fdb7cec5388756720374f9b4c70ec56d453bb2..821d10f719bd06f6c49f855ace9a5d9a3abe3b41 100644 (file)
@@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
        case SEEK_END:
                retval = fuse_update_attributes(inode, NULL, file, NULL);
                if (retval)
-                       return retval;
+                       goto exit;
                offset += i_size_read(inode);
                break;
        case SEEK_CUR:
@@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
                }
                retval = offset;
        }
+exit:
        mutex_unlock(&inode->i_mutex);
        return retval;
 }