Skip to content

Commit 4aef108

Browse files
committed
Merge tag 'for-6.6/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull device mapper fixes from Mike Snitzer: - Fix memory leak when freeing dm zoned target device - Update dm-devel mailing list address in MAINTAINERS * tag 'for-6.6/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: MAINTAINERS: update the dm-devel mailing list dm zoned: free dmz->ddev array in dmz_put_zoned_devices
2 parents b036cda + 3da5d2d commit 4aef108

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5984,8 +5984,8 @@ F: include/linux/devm-helpers.h
59845984
DEVICE-MAPPER (LVM)
59855985
M: Alasdair Kergon <[email protected]>
59865986
M: Mike Snitzer <[email protected]>
5987-
M: dm-devel@redhat.com
5988-
L: dm-devel@redhat.com
5987+
M: dm-devel@lists.linux.dev
5988+
L: dm-devel@lists.linux.dev
59895989
S: Maintained
59905990
W: http://sources.redhat.com/dm
59915991
Q: http://patchwork.kernel.org/project/dm-devel/list/

drivers/md/dm-zoned-target.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -748,17 +748,16 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path,
748748
/*
749749
* Cleanup zoned device information.
750750
*/
751-
static void dmz_put_zoned_device(struct dm_target *ti)
751+
static void dmz_put_zoned_devices(struct dm_target *ti)
752752
{
753753
struct dmz_target *dmz = ti->private;
754754
int i;
755755

756-
for (i = 0; i < dmz->nr_ddevs; i++) {
757-
if (dmz->ddev[i]) {
756+
for (i = 0; i < dmz->nr_ddevs; i++)
757+
if (dmz->ddev[i])
758758
dm_put_device(ti, dmz->ddev[i]);
759-
dmz->ddev[i] = NULL;
760-
}
761-
}
759+
760+
kfree(dmz->ddev);
762761
}
763762

764763
static int dmz_fixup_devices(struct dm_target *ti)
@@ -948,7 +947,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
948947
err_meta:
949948
dmz_dtr_metadata(dmz->metadata);
950949
err_dev:
951-
dmz_put_zoned_device(ti);
950+
dmz_put_zoned_devices(ti);
952951
err:
953952
kfree(dmz->dev);
954953
kfree(dmz);
@@ -978,7 +977,7 @@ static void dmz_dtr(struct dm_target *ti)
978977

979978
bioset_exit(&dmz->bio_set);
980979

981-
dmz_put_zoned_device(ti);
980+
dmz_put_zoned_devices(ti);
982981

983982
mutex_destroy(&dmz->chunk_lock);
984983

0 commit comments

Comments
 (0)