Subject: + drivers-cdrom-gdromc-fix-device-number-leak.patch added to -mm tree To: clbchenlibo.chen@xxxxxxxxxx,axboe@xxxxxxxxx,libo.chen@xxxxxxxxxx,tj@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 20 May 2013 15:16:03 -0700 The patch titled Subject: drivers/cdrom/gdrom.c: fix device number leak has been added to the -mm tree. Its filename is drivers-cdrom-gdromc-fix-device-number-leak.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Libo Chen <clbchenlibo.chen@xxxxxxxxxx> Subject: drivers/cdrom/gdrom.c: fix device number leak Without this patch, gdrom_major will leak when gd.cd_info alloc fails. Signed-off-by: Libo Chen <libo.chen@xxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/cdrom/gdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/cdrom/gdrom.c~drivers-cdrom-gdromc-fix-device-number-leak drivers/cdrom/gdrom.c --- a/drivers/cdrom/gdrom.c~drivers-cdrom-gdromc-fix-device-number-leak +++ a/drivers/cdrom/gdrom.c @@ -830,9 +830,9 @@ probe_fail_cdrom_register: del_gendisk(gd.disk); probe_fail_no_disk: kfree(gd.cd_info); +probe_fail_no_mem: unregister_blkdev(gdrom_major, GDROM_DEV_NAME); gdrom_major = 0; -probe_fail_no_mem: pr_warning("Probe failed - error is 0x%X\n", err); return err; } _ Patches currently in -mm which might be from clbchenlibo.chen@xxxxxxxxxx are origin.patch linux-next.patch drivers-cdrom-gdromc-fix-device-number-leak.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html