diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-02-21 11:17:34 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-02-21 11:17:34 -0500 |
| commit | 7159a986b4202343f6cca3bb8079ecace5816fd6 (patch) | |
| tree | 826bd55a9430873c0d6acec4b513f9e62f9cd5dd /fs/ext4/xattr.c | |
| parent | 793bc5181b14bf7cdfefe9d2fe8fc4a8114b78f9 (diff) | |
| download | linux-rpi-7159a986b4202343f6cca3bb8079ecace5816fd6.tar.gz linux-rpi-7159a986b4202343f6cca3bb8079ecace5816fd6.tar.bz2 linux-rpi-7159a986b4202343f6cca3bb8079ecace5816fd6.zip | |
ext4: fix some error pointer dereferences
We can't pass error pointers to brelse().
Fixes: fb265c9cb49e ("ext4: add ext4_sb_bread() to disambiguate ENOMEM cases")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4/xattr.c')
| -rw-r--r-- | fs/ext4/xattr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 86ed9c686249..dc82e7757f67 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -829,6 +829,7 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *usage) bh = ext4_sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl, REQ_PRIO); if (IS_ERR(bh)) { ret = PTR_ERR(bh); + bh = NULL; goto out; } @@ -2903,6 +2904,7 @@ int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, if (error == -EIO) EXT4_ERROR_INODE(inode, "block %llu read error", EXT4_I(inode)->i_file_acl); + bh = NULL; goto cleanup; } error = ext4_xattr_check_block(inode, bh); @@ -3059,6 +3061,7 @@ ext4_xattr_block_cache_find(struct inode *inode, if (IS_ERR(bh)) { if (PTR_ERR(bh) == -ENOMEM) return NULL; + bh = NULL; EXT4_ERROR_INODE(inode, "block %lu read error", (unsigned long)ce->e_value); } else if (ext4_xattr_cmp(header, BHDR(bh)) == 0) { |