cdrom: gdrom: initialize global variable at init time

As Peter points out, if we were to disconnect and then reconnect this
driver from a device, the "global" state of the device would contain odd
values and could cause problems.  Fix this up by just initializing the
whole thing to 0 at probe() time.

Ideally this would be a per-device variable, but given the age and the
total lack of users of it, that would require a lot of s/./->/g changes
for really no good reason.

Reported-by: Peter Rosin <peda@axentia.se>
Cc: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Peter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/YJP2j6AU82MqEY2M@kroah.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2021-05-06 16:00:47 +02:00
parent 419b4a142a
commit 9183f01b5e
1 changed files with 8 additions and 1 deletions

View File

@ -744,6 +744,13 @@ static const struct blk_mq_ops gdrom_mq_ops = {
static int probe_gdrom(struct platform_device *devptr) static int probe_gdrom(struct platform_device *devptr)
{ {
int err; int err;
/*
* Ensure our "one" device is initialized properly in case of previous
* usages of it
*/
memset(&gd, 0, sizeof(gd));
/* Start the device */ /* Start the device */
if (gdrom_execute_diagnostic() != 1) { if (gdrom_execute_diagnostic() != 1) {
pr_warn("ATA Probe for GDROM failed\n"); pr_warn("ATA Probe for GDROM failed\n");
@ -847,7 +854,7 @@ static struct platform_driver gdrom_driver = {
static int __init init_gdrom(void) static int __init init_gdrom(void)
{ {
int rc; int rc;
gd.toc = NULL;
rc = platform_driver_register(&gdrom_driver); rc = platform_driver_register(&gdrom_driver);
if (rc) if (rc)
return rc; return rc;