[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <YJP2j6AU82MqEY2M@kroah.com>
Date: Thu, 6 May 2021 16:00:47 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Peter Rosin <peda@...ntia.se>
Cc: linux-kernel@...r.kernel.org,
Atul Gopinathan <atulgopinathan@...il.com>,
Jens Axboe <axboe@...nel.dk>, stable <stable@...r.kernel.org>
Subject: [PATCH] cdrom: gdrom: initialize global variable at init time
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
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@...ntia.se>
Cc: Jens Axboe <axboe@...nel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
Note, this goes on top of my previous "gdrom" patch submitted here:
https://lore.kernel.org/lkml/20210503115736.2104747-28-gregkh@linuxfoundation.org/
And I'll just take it in the same series.
drivers/cdrom/gdrom.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 6c4f6139f853..c6d8c0f59722 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -744,6 +744,13 @@ static const struct blk_mq_ops gdrom_mq_ops = {
static int probe_gdrom(struct platform_device *devptr)
{
int err;
+
+ /*
+ * Ensure our "one" device is initialized properly in case of previous
+ * usages of it
+ */
+ memset(&gd, 0, sizeof(gd));
+
/* Start the device */
if (gdrom_execute_diagnostic() != 1) {
pr_warn("ATA Probe for GDROM failed\n");
@@ -847,7 +854,7 @@ static struct platform_driver gdrom_driver = {
static int __init init_gdrom(void)
{
int rc;
- gd.toc = NULL;
+
rc = platform_driver_register(&gdrom_driver);
if (rc)
return rc;
--
2.31.1
Powered by blists - more mailing lists