From 257343d3ed557f11d580d0b7c515dc154f64a42b Mon Sep 17 00:00:00 2001

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Date: Mon, 3 May 2021 13:56:53 +0200

Subject: [PATCH] Revert "gdrom: fix a memory leak bug"

Git-commit: 257343d3ed557f11d580d0b7c515dc154f64a42b

Patch-mainline: v5.13-rc3

References: git-fixes

This reverts commit 093c48213ee37c3c3ff1cf5ac1aa2a9d8bc66017.

Because of recent interactions with developers from @umn.edu, all

commits from them have been recently re-reviewed to ensure if they were

correct or not.

Upon review, this commit was found to be incorrect for the reasons

below, so it must be reverted.  It will be fixed up "correctly" in a

later kernel change.

Because of this, all submissions from this group must be reverted from

the kernel tree and will need to be re-reviewed again to determine if

they actually are a valid fix.  Until that work is complete, remove this

change to ensure that no problems are being introduced into the

codebase.

Cc: Wenwen Wang <wang6495@umn.edu>

Cc: Peter Rosin <peda@axentia.se>

Cc: Jens Axboe <axboe@kernel.dk>

Fixes: 093c48213ee3 ("gdrom: fix a memory leak bug")

Cc: stable <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/20210503115736.2104747-27-gregkh@linuxfoundation.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/cdrom/gdrom.c | 1 -

 1 file changed, 1 deletion(-)

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c

index 742b4a0932e3..7f681320c7d3 100644

--- a/drivers/cdrom/gdrom.c

+++ b/drivers/cdrom/gdrom.c

@@ -862,7 +862,6 @@ static void __exit exit_gdrom(void)

 	platform_device_unregister(pd);

 	platform_driver_unregister(&gdrom_driver);

 	kfree(gd.toc);

-	kfree(gd.cd_info);

 }

 module_init(init_gdrom);

-- 

2.26.2