Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 151881f7 authored by Atul Gopinathan's avatar Atul Gopinathan Committed by Greg Kroah-Hartman
Browse files

cdrom: gdrom: deallocate struct gdrom_unit fields in remove_gdrom 



commit d03d1021da6fe7f46efe9f2a7335564e7c9db5ab upstream.

The fields, "toc" and "cd_info", of "struct gdrom_unit gd" are allocated
in "probe_gdrom()". Prevent a memory leak by making sure "gd.cd_info" is
deallocated in the "remove_gdrom()" function.

Also prevent double free of the field "gd.toc" by moving it from the
module's exit function to "remove_gdrom()". This is because, in
"probe_gdrom()", the function makes sure to deallocate "gd.toc" in case
of any errors, so the exit function invoked later would again free
"gd.toc".

The patch also maintains consistency by deallocating the above mentioned
fields in "remove_gdrom()" along with another memory allocated field
"gd.disk".

Suggested-by: default avatarJens Axboe <axboe@kernel.dk>
Cc: Peter Rosin <peda@axentia.se>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarAtul Gopinathan <atulgopinathan@gmail.com>
Link: https://lore.kernel.org/r/20210503115736.2104747-28-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0c8f54d

drivers/cdrom/gdrom.c

+2 −1
Original line number Diff line number Diff line
@@ -850,6 +850,8 @@ static int remove_gdrom(struct platform_device *devptr) 
	if (gdrom_major)

		unregister_blkdev(gdrom_major, GDROM_DEV_NAME);

	unregister_cdrom(gd.cd_info);

	kfree(gd.cd_info);

	kfree(gd.toc);



	return 0;

}
@@ -881,7 +883,6 @@ static void __exit exit_gdrom(void) 
{

	platform_device_unregister(pd);

	platform_driver_unregister(&gdrom_driver);

	kfree(gd.toc);

}



module_init(init_gdrom);