* [PATCH] ext4: Fix some error pointer dereferences
@ 2019-01-03 11:38 Dan Carpenter
2019-01-21 14:17 ` Jan Kara
2019-02-21 16:18 ` Theodore Y. Ts'o
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2019-01-03 11:38 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: Andreas Dilger, linux-ext4, kernel-janitors
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>
---
fs/ext4/xattr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 7fddd519adae..6ddbbe21fdd8 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) {
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ext4: Fix some error pointer dereferences
2019-01-03 11:38 [PATCH] ext4: Fix some error pointer dereferences Dan Carpenter
@ 2019-01-21 14:17 ` Jan Kara
2019-02-21 16:18 ` Theodore Y. Ts'o
1 sibling, 0 replies; 3+ messages in thread
From: Jan Kara @ 2019-01-21 14:17 UTC (permalink / raw)
To: Dan Carpenter
Cc: Theodore Ts'o, Andreas Dilger, linux-ext4, kernel-janitors
On Thu 03-01-19 14:38:11, Dan Carpenter wrote:
> 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>
Thanks for catching this. The patch looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/xattr.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
> index 7fddd519adae..6ddbbe21fdd8 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) {
> --
> 2.17.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ext4: Fix some error pointer dereferences
2019-01-03 11:38 [PATCH] ext4: Fix some error pointer dereferences Dan Carpenter
2019-01-21 14:17 ` Jan Kara
@ 2019-02-21 16:18 ` Theodore Y. Ts'o
1 sibling, 0 replies; 3+ messages in thread
From: Theodore Y. Ts'o @ 2019-02-21 16:18 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Andreas Dilger, linux-ext4, kernel-janitors
On Thu, Jan 03, 2019 at 02:38:11PM +0300, Dan Carpenter wrote:
> 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>
Applied, thanks.
- Ted
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-21 16:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-03 11:38 [PATCH] ext4: Fix some error pointer dereferences Dan Carpenter
2019-01-21 14:17 ` Jan Kara
2019-02-21 16:18 ` Theodore Y. Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).