OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bio: Fix potential memory leak in bio_find_or_create_slab() 

Do not leak memory by updating pointer with potentially NULL realloc return value.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Alexey Khoroshilov 2012-08-09 15:19:25 +02:00 committed by Jens Axboe
parent 0676806707
commit 389d7b26d9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/bio.c
View File

@ -73,7 +73,7 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size)
{ {
unsigned int sz = sizeof(struct bio) + extra_size; unsigned int sz = sizeof(struct bio) + extra_size;
struct kmem_cache *slab = NULL; struct kmem_cache *slab = NULL;
struct bio_slab *bslab; struct bio_slab *bslab, *new_bio_slabs;
unsigned int i, entry = -1; unsigned int i, entry = -1;
mutex_lock(&bio_slab_lock); mutex_lock(&bio_slab_lock);
@ -97,11 +97,12 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size)
if (bio_slab_nr == bio_slab_max && entry == -1) { if (bio_slab_nr == bio_slab_max && entry == -1) {
bio_slab_max <<= 1; bio_slab_max <<= 1;
bio_slabs = krealloc(bio_slabs, new_bio_slabs = krealloc(bio_slabs,
bio_slab_max * sizeof(struct bio_slab), bio_slab_max * sizeof(struct bio_slab),
GFP_KERNEL); GFP_KERNEL);
if (!bio_slabs) if (!new_bio_slabs)
goto out_unlock; goto out_unlock;
bio_slabs = new_bio_slabs;
} }
if (entry == -1) if (entry == -1)
entry = bio_slab_nr++; entry = bio_slab_nr++;