mtd: ubi: fix kref leak on -EBUSY return in ubi_detach_mtd_dev()
Subsystems (2)
PATCH 1/1 mtd: ubi: fix kref leak on -EBUSY return in ubi_detach_mtd_dev()
ubi_detach_mtd_dev() calls ubi_get_device() which increments both ubi->ref_count and the device kref via get_device(). When the device is busy and anyway==0, the function returns -EBUSY after releasing ubi_devices_lock, but never calls put_device() to drop the kref acquired by ubi_get_device(). This leaks the kref, preventing the device from ever being freed.
Commit 7e84c961b2eb ("mtd: ubi: introduce pre-removal notification for UBI volumes") moved put_device() to after ubi->is_dead = true to pair it with the notify+nullify sequence, but inadvertently left the early -EBUSY return without a matching put_device().
Add put_device(&ubi->dev) before returning -EBUSY to balance the get_device() inside ubi_get_device().
--- drivers/mtd/ubi/build.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/ubi/build.c +1 -0
@@ -1106,6 +1106,7 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)if (ubi->ref_count) {if (!anyway) {spin_unlock (&ubi_devices_lock); +put_device (&ubi->dev);return -EBUSY ; }/* This may only happen if there is a bug */
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 12 lines · Yuho Choi
ubi_detach_mtd_dev()callsubi_get_device()which increments bothubi->ref_countand the device kref viaget_device(). When the device is busy and anyway==0, the function returns-EBUSYafter releasingubi_devices_lock, but never callsput_device()to drop the kref acquired byubi_get_device(). This leaks the kref, preventing the device from ever being freed.Commit
7e84c961b2eb("mtd: ubi: introduce pre-removal notification for UBI volumes") movedput_device()to afterubi->is_dead= true to pair it with the notify+nullify sequence, but inadvertently left the early-EBUSYreturn without a matchingput_device().
Quoted 8 lines
Add
put_device(&ubi->dev)before returning-EBUSYto balance theget_device()insideubi_get_device().Fixes 7e84c961b2eb ("mtd: ubi: introduce pre-removal notification for UBI volumes")Signed-off-by Yuho Choi <[email protected]>--- drivers/mtd/ubi/build.c | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
drivers/mtd/ubi/build.c +1
-0@@ -1106,6 +1106,7 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)if (ubi->ref_count) {if (!anyway) {spin_unlock (&ubi_devices_lock); +put_device (&ubi->dev);return -EBUSY ; }/* This may only happen if there is a bug */
Dear Zhihao,
Thank you for the review. I appreciate your feedback on this fix.
Best regards,
Yuho
Quoted 39 lines · Zhihao Cheng
Quoted 12 lines · Yuho Choi
ubi_detach_mtd_dev()callsubi_get_device()which increments bothubi->ref_countand the device kref viaget_device(). When the device is busy and anyway==0, the function returns-EBUSYafter releasingubi_devices_lock, but never callsput_device()to drop the kref acquired byubi_get_device(). This leaks the kref, preventing the device from ever being freed.Commit
7e84c961b2eb("mtd: ubi: introduce pre-removal notification for UBI volumes") movedput_device()to afterubi->is_dead= true to pair it with the notify+nullify sequence, but inadvertently left the early-EBUSYreturn without a matchingput_device().Quoted 8 lines
Add
put_device(&ubi->dev)before returning-EBUSYto balance theget_device()insideubi_get_device().Fixes 7e84c961b2eb ("mtd: ubi: introduce pre-removal notification for UBI volumes")Signed-off-by Yuho Choi <[email protected]>--- drivers/mtd/ubi/build.c | 1 + 1 file changed, 1 insertion(+)Reviewed-by Zhihao Cheng <[email protected]>Quoted 14 lines
drivers/mtd/ubi/build.c +1
-0@@ -1106,6 +1106,7 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)if (ubi->ref_count) {if (!anyway) {spin_unlock (&ubi_devices_lock); +put_device (&ubi->dev);return -EBUSY ; }/* This may only happen if there is a bug */