Skip to contentSkip to conversation

mtd: mtdswap: Avoid freeing registered blktrans device twice

PATCH Applied Ruoyu Wang 2 participants 2 messages Jul 8 – Jul 17 Memory technology devices (MTD)

lore
Share & tools
lore

Ruoyu Wang

author
#0 lore raw

PATCH 1/1 mtd: mtdswap: Avoid freeing registered blktrans device twice

In mtdswap_add_mtd(), debugfs setup failure after successful blktrans registration can free mbd_dev twice.

add_mtd_blktrans_dev() initializes the blktrans device reference and publishes the disk. Once that succeeds, del_mtd_blktrans_dev() tears the disk down and drops the blktrans reference; when that reference reaches zero, blktrans_dev_release() frees the mtd_blktrans_dev.

The debugfs failure path called del_mtd_blktrans_dev(mbd_dev), then fell through the common cleanup label and called kfree(mbd_dev) again. Clear the local pointer after deregistration so the common cleanup can still release the mtdswap state without freeing the blktrans object twice.

This issue was found by a static analysis checker and confirmed by manual source review.

Fixes e8e3edb95ce6 ("mtd: create per-device and module-scope debugfs entries")
---
 drivers/mtd/mtdswap.c | 1 +
 1 file changed, 1 insertion(+)
drivers/mtd/mtdswap.c +1 -0
index 866933fc84265..533b8948918cb 100644
@@ -1450,6 +1450,7 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 
 debugfs_failed:
 	del_mtd_blktrans_dev(mbd_dev);
+	mbd_dev = NULL;
 
 cleanup:
 	mtdswap_cleanup(d);
Signature · 1 line
2.51.0
maintainer Applied
#1 lore raw
Quoted 9 lines · Ruoyu Wang

In mtdswap_add_mtd(), debugfs setup failure after successful blktrans registration can free mbd_dev twice.

add_mtd_blktrans_dev() initializes the blktrans device reference and publishes the disk. Once that succeeds, del_mtd_blktrans_dev() tears the disk down and drops the blktrans reference; when that reference reaches zero, blktrans_dev_release() frees the mtd_blktrans_dev.

[...]

Applied to mtd/next, thanks!

[1/1] mtd: mtdswap: Avoid freeing registered blktrans device twice

      commit: 779aa4c66a96bf43d2d62982ea1a9096a9128d87

Patche(s) should be available on mtd/linux.git and will be part of the next PR (provided that no robot complains by then).

Kind regards,
Miquèl