* [PATCH] Btrfs: fix uncheck memory allocations
@ 2011-02-15 12:01 Yoshinori Sano
2011-02-15 12:10 ` Yoshinori Sano
0 siblings, 1 reply; 2+ messages in thread
From: Yoshinori Sano @ 2011-02-15 12:01 UTC (permalink / raw)
To: linux-btrfs; +Cc: Yoshinori Sano
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: Yoshinori Sano <yoshinori.sano@gmail.com>
---
fs/btrfs/compression.c | 6 ++++++
fs/btrfs/extent-tree.c | 4 ++++
fs/btrfs/inode.c | 2 ++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 4d2110e..992a4b9 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -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);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a7aaa10..3c6d0f2 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6931,6 +6931,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);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8d392ed..12a5a40 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -287,6 +287,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;
@@ -384,6 +385,7 @@ again:
(BTRFS_I(inode)->force_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;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Btrfs: fix uncheck memory allocations
2011-02-15 12:01 [PATCH] Btrfs: fix uncheck memory allocations Yoshinori Sano
@ 2011-02-15 12:10 ` Yoshinori Sano
0 siblings, 0 replies; 2+ messages in thread
From: Yoshinori Sano @ 2011-02-15 12:10 UTC (permalink / raw)
To: linux-btrfs; +Cc: chris.mason, t-itoh
This is the modified version of my previous patch.
This patch is created by removing the duplicated (conflicted) code
of the following work.
Tsutomu Itoh (1) commits (+7/-3):
Btrfs: check return value of alloc_extent_map()
http://marc.info/?l=3Dlinux-btrfs&m=3D129774185204197&w=3D2
Regards,
2011/2/15 Yoshinori Sano <yoshinori.sano@gmail.com>:
> To make Btrfs code more robust, several return value checks where mem=
ory
> allocation can fail are introduced. I use BUG_ON where I don't know h=
ow
> to handle the error properly, which increases the number of using the
> notorious BUG_ON, though.
>
> Signed-off-by: Yoshinori Sano <yoshinori.sano@gmail.com>
> ---
> =A0fs/btrfs/compression.c | =A0 =A06 ++++++
> =A0fs/btrfs/extent-tree.c | =A0 =A04 ++++
> =A0fs/btrfs/inode.c =A0 =A0 =A0 | =A0 =A02 ++
> =A03 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index 4d2110e..992a4b9 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -340,6 +340,8 @@ int btrfs_submit_compressed_write(struct inode *i=
node, u64 start,
>
> =A0 =A0 =A0 =A0WARN_ON(start & ((u64)PAGE_CACHE_SIZE - 1));
> =A0 =A0 =A0 =A0cb =3D kmalloc(compressed_bio_size(root, compressed_le=
n), GFP_NOFS);
> + =A0 =A0 =A0 if (!cb)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -ENOMEM;
> =A0 =A0 =A0 =A0atomic_set(&cb->pending_bios, 0);
> =A0 =A0 =A0 =A0cb->errors =3D 0;
> =A0 =A0 =A0 =A0cb->inode =3D inode;
> @@ -354,6 +356,10 @@ int btrfs_submit_compressed_write(struct inode *=
inode, u64 start,
> =A0 =A0 =A0 =A0bdev =3D BTRFS_I(inode)->root->fs_info->fs_devices->la=
test_bdev;
>
> =A0 =A0 =A0 =A0bio =3D compressed_bio_alloc(bdev, first_byte, GFP_NOF=
S);
> + =A0 =A0 =A0 if(!bio) {
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 kfree(cb);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -ENOMEM;
> + =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0bio->bi_private =3D cb;
> =A0 =A0 =A0 =A0bio->bi_end_io =3D end_compressed_bio_write;
> =A0 =A0 =A0 =A0atomic_inc(&cb->pending_bios);
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index a7aaa10..3c6d0f2 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -6931,6 +6931,10 @@ static noinline int get_new_locations(struct i=
node *reloc_inode,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct disk_extent *ol=
d =3D exts;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0max *=3D 2;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0exts =3D kzalloc(sizeo=
f(*exts) * max, GFP_NOFS);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!exts) {
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ret =3D=
-ENOMEM;
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto ou=
t;
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0memcpy(exts, old, size=
of(*exts) * nr);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (old !=3D *extents)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0kfree(=
old);
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 8d392ed..12a5a40 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -287,6 +287,7 @@ static noinline int add_async_extent(struct async=
_cow *cow,
> =A0 =A0 =A0 =A0struct async_extent *async_extent;
>
> =A0 =A0 =A0 =A0async_extent =3D kmalloc(sizeof(*async_extent), GFP_NO=
=46S);
> + =A0 =A0 =A0 BUG_ON(!async_extent);
> =A0 =A0 =A0 =A0async_extent->start =3D start;
> =A0 =A0 =A0 =A0async_extent->ram_size =3D ram_size;
> =A0 =A0 =A0 =A0async_extent->compressed_size =3D compressed_size;
> @@ -384,6 +385,7 @@ again:
> =A0 =A0 =A0 =A0 =A0 =A0 (BTRFS_I(inode)->force_compress))) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0WARN_ON(pages);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pages =3D kzalloc(sizeof(struct page *=
) * nr_pages, GFP_NOFS);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 BUG_ON(!pages);
>
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (BTRFS_I(inode)->force_compress)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0compress_type =3D BTRF=
S_I(inode)->force_compress;
> --
> 1.7.1
>
>
--=20
Yoshinori Sano <yoshinori.sano@gmail.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" =
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-15 12:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-15 12:01 [PATCH] Btrfs: fix uncheck memory allocations Yoshinori Sano
2011-02-15 12:10 ` Yoshinori Sano
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).