diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2011-07-06 00:29:59 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2011-07-07 17:45:46 +0200 |
| commit | 5bd9d99d107c56ff7b35a29e930d85f91a07b2fd (patch) | |
| tree | b5db237ebff38c90b95f01d8cca28bc8c2536e7f /fs/hfsplus/inode.c | |
| parent | hfsplus: lift the 2TB size limit (diff) | |
| download | linux-5bd9d99d107c56ff7b35a29e930d85f91a07b2fd.tar.xz linux-5bd9d99d107c56ff7b35a29e930d85f91a07b2fd.zip | |
hfsplus: add error checking for hfs_find_init()
hfs_find_init() may fail with ENOMEM, but there are places, where
the returned value is not checked. The consequences can be very
unpleasant, e.g. kfree uninitialized pointer and
inappropriate mutex unlocking.
The patch adds checks for errors in hfs_find_init().
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/hfsplus/inode.c')
| -rw-r--r-- | fs/hfsplus/inode.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index b248a6cfcad9..010cd363d085 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -195,11 +195,13 @@ static struct dentry *hfsplus_file_lookup(struct inode *dir, hip->flags = 0; set_bit(HFSPLUS_I_RSRC, &hip->flags); - hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd); - err = hfsplus_find_cat(sb, dir->i_ino, &fd); - if (!err) - err = hfsplus_cat_read_inode(inode, &fd); - hfs_find_exit(&fd); + err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd); + if (!err) { + err = hfsplus_find_cat(sb, dir->i_ino, &fd); + if (!err) + err = hfsplus_cat_read_inode(inode, &fd); + hfs_find_exit(&fd); + } if (err) { iput(inode); return ERR_PTR(err); |