Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dac97e51 authored by Yoshinori Sano's avatar Yoshinori Sano Committed by root
Browse files

Btrfs: fix uncheck memory allocations 



To make Btrfs code more robust, several return value checks where memory
allocation can fail are introduced. I use BUG_ON where I don't know how
to handle the error properly, which increases the number of using the
notorious BUG_ON, though.

Signed-off-by: default avatarYoshinori Sano <yoshinori.sano@gmail.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent c622ae60

fs/btrfs/compression.c

+6 −0
Original line number Diff line number Diff line
@@ -340,6 +340,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 


	WARN_ON(start & ((u64)PAGE_CACHE_SIZE - 1));

	cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);

	if (!cb)

		return -ENOMEM;

	atomic_set(&cb->pending_bios, 0);

	cb->errors = 0;

	cb->inode = inode;
@@ -354,6 +356,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;



	bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS);

	if(!bio) {

		kfree(cb);

		return -ENOMEM;

	}

	bio->bi_private = cb;

	bio->bi_end_io = end_compressed_bio_write;

	atomic_inc(&cb->pending_bios);

fs/btrfs/extent-tree.c

+4 −0
Original line number Diff line number Diff line
@@ -6978,6 +6978,10 @@ static noinline int get_new_locations(struct inode *reloc_inode, 
			struct disk_extent *old = exts;

			max *= 2;

			exts = kzalloc(sizeof(*exts) * max, GFP_NOFS);

			if (!exts) {

				ret = -ENOMEM;

				goto out;

			}

			memcpy(exts, old, sizeof(*exts) * nr);

			if (old != *extents)

				kfree(old);

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static noinline int add_async_extent(struct async_cow *cow, 
	struct async_extent *async_extent;



	async_extent = kmalloc(sizeof(*async_extent), GFP_NOFS);

	BUG_ON(!async_extent);

	async_extent->start = start;

	async_extent->ram_size = ram_size;

	async_extent->compressed_size = compressed_size;
@@ -388,6 +389,7 @@ static noinline int compress_file_range(struct inode *inode, 
	     (BTRFS_I(inode)->flags & BTRFS_INODE_COMPRESS))) {

		WARN_ON(pages);

		pages = kzalloc(sizeof(struct page *) * nr_pages, GFP_NOFS);

		BUG_ON(!pages);



		if (BTRFS_I(inode)->force_compress)

			compress_type = BTRFS_I(inode)->force_compress;