From: Sergey Shtylyov <s.shtylyov@omp.ru>
To: Damien Le Moal <damien.lemoal@opensource.wdc.com>,
<linux-ide@vger.kernel.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH] ata: libata-sff: fix reading uninitialized variable in ata_sff_lost_interrupt()
Date: Fri, 18 Feb 2022 14:05:57 +0300 [thread overview]
Message-ID: <5e02673b-57d2-40b1-ceba-55abfb251089@omp.ru> (raw)
Due to my sloppy coding in commit 2c75a451ecb0 ("ata: libata-sff: refactor
ata_sff_altstatus()"), in ata_sff_lost_interrupt() iff the device control
register doesn't exists, ata_port_warn() would print the 'status' variable
which never gets assigned. Restore the original order of the statements,
wrapping the ata_sff_altstatus() call in WARN_ON_ONCE()...
While at it, fix crazy indentation in the ata_port_warn() call itself...
Fixes: 2c75a451ecb0 ("ata: libata-sff: refactor ata_sff_altstatus()")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
drivers/ata/libata-sff.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: libata/drivers/ata/libata-sff.c
===================================================================
--- libata.orig/drivers/ata/libata-sff.c
+++ libata/drivers/ata/libata-sff.c
@@ -1644,13 +1644,14 @@ void ata_sff_lost_interrupt(struct ata_p
return;
/* See if the controller thinks it is still busy - if so the command
isn't a lost IRQ but is still in progress */
- if (ata_sff_altstatus(ap, &status) && (status & ATA_BUSY))
+ if (WARN_ON_ONCE(!ata_sff_altstatus(ap, &status)))
+ return;
+ if (status & ATA_BUSY)
return;
/* There was a command running, we are no longer busy and we have
no interrupt. */
- ata_port_warn(ap, "lost interrupt (Status 0x%x)\n",
- status);
+ ata_port_warn(ap, "lost interrupt (Status 0x%x)\n", status);
/* Run the host interrupt logic as if the interrupt had not been
lost */
ata_sff_port_intr(ap, qc);
next reply other threads:[~2022-02-18 11:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 11:05 Sergey Shtylyov [this message]
2022-02-18 11:17 ` [PATCH] ata: libata-sff: fix reading uninitialized variable in ata_sff_lost_interrupt() Sergey Shtylyov
2022-02-18 23:00 ` Damien Le Moal
2022-02-19 2:39 ` Damien Le Moal
2022-02-19 9:52 ` Sergey Shtylyov
2022-02-19 23:01 ` Damien Le Moal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e02673b-57d2-40b1-ceba-55abfb251089@omp.ru \
--to=s.shtylyov@omp.ru \
--cc=damien.lemoal@opensource.wdc.com \
--cc=dan.carpenter@oracle.com \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox