mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	ext4: fix some error pointer dereferences
We can't pass error pointers to brelse().
Fixes: fb265c9cb4 ("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>
			
			
This commit is contained in:
		
							parent
							
								
									793bc5181b
								
							
						
					
					
						commit
						7159a986b4
					
				
					 1 changed files with 3 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue