redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ext4: fix memory leaks in error path handling of ext4_ext_zeroout()

Browse source 
When EIO occurs after bio is submitted, there is no memory free
operation for bio, which results in memory leakage. And there is also
no check against bio_alloc() for bio.

Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Jing Zhang <zj.barak@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Jing Zhang 2010-05-12 00:00:00 -04:00 committed by Theodore Ts'o
parent c26d0bad3d
commit b720303df7
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/ext4/extents.c
View file

@ -2544,7 +2544,7 @@ static void bi_complete(struct bio *bio, int error)
/* FIXME!! we need to try to merge to left or right after zero-out */ /* FIXME!! we need to try to merge to left or right after zero-out */
static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex) static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
{ {
int ret = -EIO; int ret;
struct bio *bio; struct bio *bio;
int blkbits, blocksize; int blkbits, blocksize;
sector_t ee_pblock; sector_t ee_pblock;
@ -2568,6 +2568,9 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
len = ee_len; len = ee_len;
bio = bio_alloc(GFP_NOIO, len); bio = bio_alloc(GFP_NOIO, len);
if (!bio)
return -ENOMEM;
bio->bi_sector = ee_pblock; bio->bi_sector = ee_pblock;
bio->bi_bdev = inode->i_sb->s_bdev; bio->bi_bdev = inode->i_sb->s_bdev;
@ -2595,17 +2598,15 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
submit_bio(WRITE, bio); submit_bio(WRITE, bio);
wait_for_completion(&event); wait_for_completion(&event);
if (test_bit(BIO_UPTODATE, &bio->bi_flags)) if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {
ret = 0; bio_put(bio);
else { return -EIO;
ret = -EIO;
break;
} }
bio_put(bio); bio_put(bio);
ee_len -= done; ee_len -= done;
ee_pblock += done << (blkbits - 9); ee_pblock += done << (blkbits - 9);
} }
return ret; return 0;
} }
#define EXT4_EXT_ZERO_LEN 7 #define EXT4_EXT_ZERO_LEN 7