Commit a88c4ec8 authored by Fedor Pchelkin's avatar Fedor Pchelkin Committed by sanglipeng
Browse files

dm zoned: free dmz->ddev array in dmz_put_zoned_devices 

stable inclusion
from stable-v5.10.198
commit ccd87fe7a0f6f42bbe1c577125d432ebdcc59198
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I987V5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ccd87fe7a0f6f42bbe1c577125d432ebdcc59198



--------------------------------

commit 9850ccd5 upstream.

Commit 4dba1288 ("dm zoned: support arbitrary number of devices")
made the pointers to additional zoned devices to be stored in a
dynamically allocated dmz->ddev array. However, this array is not freed.

Rename dmz_put_zoned_device to dmz_put_zoned_devices and fix it to
free the dmz->ddev array when cleaning up zoned device information.
Remove NULL assignment for all dmz->ddev elements and just free the
dmz->ddev array instead.

Found by Linux Verification Center (linuxtesting.org).

Fixes: 4dba1288 ("dm zoned: support arbitrary number of devices")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarFedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 937e711c

drivers/md/dm-zoned-target.c

+7 −8
Original line number Diff line number Diff line
@@ -750,17 +750,16 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path, 
/*

 * Cleanup zoned device information.

 */

static void dmz_put_zoned_device(struct dm_target *ti)

static void dmz_put_zoned_devices(struct dm_target *ti)

{

	struct dmz_target *dmz = ti->private;

	int i;



	for (i = 0; i < dmz->nr_ddevs; i++) {

		if (dmz->ddev[i]) {

	for (i = 0; i < dmz->nr_ddevs; i++)

		if (dmz->ddev[i])

			dm_put_device(ti, dmz->ddev[i]);

			dmz->ddev[i] = NULL;

		}

	}



	kfree(dmz->ddev);

}



static int dmz_fixup_devices(struct dm_target *ti)
@@ -951,7 +950,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
err_meta:

	dmz_dtr_metadata(dmz->metadata);

err_dev:

	dmz_put_zoned_device(ti);

	dmz_put_zoned_devices(ti);

err:

	kfree(dmz->dev);

	kfree(dmz);
@@ -982,7 +981,7 @@ static void dmz_dtr(struct dm_target *ti) 


	bioset_exit(&dmz->bio_set);



	dmz_put_zoned_device(ti);

	dmz_put_zoned_devices(ti);



	mutex_destroy(&dmz->chunk_lock);