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

Commit 93cf19b4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

bcache: add proper error unwinding in bcache_device_init 



[ Upstream commit 224b0683228c5f332f9cee615d85e75e9a347170 ]

Except for the IDA none of the allocations in bcache_device_init is
unwound on error, fix that.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarColy Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20210809064028.1198327-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e55f2079

drivers/md/bcache/super.c

+11 −5
Original line number Diff line number Diff line
@@ -839,20 +839,20 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size, 
	n = BITS_TO_LONGS(d->nr_stripes) * sizeof(unsigned long);

	d->full_dirty_stripes = kvzalloc(n, GFP_KERNEL);

	if (!d->full_dirty_stripes)

		return -ENOMEM;

		goto out_free_stripe_sectors_dirty;



	idx = ida_simple_get(&bcache_device_idx, 0,

				BCACHE_DEVICE_IDX_MAX, GFP_KERNEL);

	if (idx < 0)

		return idx;

		goto out_free_full_dirty_stripes;



	if (bioset_init(&d->bio_split, 4, offsetof(struct bbio, bio),

			BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER))

		goto err;

		goto out_ida_remove;



	d->disk = alloc_disk(BCACHE_MINORS);

	if (!d->disk)

		goto err;

		goto out_bioset_exit;



	set_capacity(d->disk, sectors);

	snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i", idx);
@@ -887,8 +887,14 @@ static int bcache_device_init(struct bcache_device *d, unsigned int block_size, 


	return 0;



err:

out_bioset_exit:

	bioset_exit(&d->bio_split);

out_ida_remove:

	ida_simple_remove(&bcache_device_idx, idx);

out_free_full_dirty_stripes:

	kvfree(d->full_dirty_stripes);

out_free_stripe_sectors_dirty:

	kvfree(d->stripe_sectors_dirty);

	return -ENOMEM;



}