From: Shigeru Yoshida <syoshida@redhat.com>
To: jejb@linux.ibm.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Shigeru Yoshida <syoshida@redhat.com>
Subject: [PATCH] scsi: sr: Fix a potential uninit-value in sr_get_events()
Date: Thu, 1 Jun 2023 01:43:46 +0900 [thread overview]
Message-ID: <20230531164346.118438-1-syoshida@redhat.com> (raw)
KMSAN found the following issue:
BUG: KMSAN: uninit-value in sr_check_events+0x365/0x1460
sr_check_events+0x365/0x1460
cdrom_check_events+0x66/0x170
sr_block_check_events+0xf2/0x130
disk_check_events+0xec/0x900
bdev_check_media_change+0x2a6/0x7d0
sr_block_open+0x154/0x320
blkdev_get_whole+0xa8/0x6c0
blkdev_get_by_dev+0x50f/0x1200
blkdev_open+0x215/0x430
do_dentry_open+0xfbd/0x19a0
vfs_open+0x7b/0xa0
path_openat+0x4a54/0x5b40
do_filp_open+0x24d/0x660
do_sys_openat2+0x1f0/0x910
__x64_sys_openat+0x2b4/0x330
do_syscall_64+0x41/0xc0
entry_SYSCALL_64_after_hwframe+0x63/0xcd
Local variable sshdr.i created at:
sr_check_events+0x131/0x1460
cdrom_check_events+0x66/0x170
sr_get_events() can access uninitialized local variable sshdr when
scsi_execute_cmd() returns error. This patch fixes the issue by
checking the result before accessing sshdr.
Fixes: 93aae17af117 ("sr: implement sr_check_events()")
Signed-off-by: Shigeru Yoshida <syoshida@redhat.com>
---
drivers/scsi/sr.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 12869e6d4ebd..86b43c069a44 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -177,10 +177,13 @@ static unsigned int sr_get_events(struct scsi_device *sdev)
result = scsi_execute_cmd(sdev, cmd, REQ_OP_DRV_IN, buf, sizeof(buf),
SR_TIMEOUT, MAX_RETRIES, &exec_args);
+ if (result)
+ return 0;
+
if (scsi_sense_valid(&sshdr) && sshdr.sense_key == UNIT_ATTENTION)
return DISK_EVENT_MEDIA_CHANGE;
- if (result || be16_to_cpu(eh->data_len) < sizeof(*med))
+ if (be16_to_cpu(eh->data_len) < sizeof(*med))
return 0;
if (eh->nea || eh->notification_class != 0x4)
--
2.39.0
next reply other threads:[~2023-05-31 16:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 16:43 Shigeru Yoshida [this message]
2023-05-31 22:44 ` Bart Van Assche
2023-10-30 8:13 ` Shigeru Yoshida
2023-10-30 15:02 ` michael.christie
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=20230531164346.118438-1-syoshida@redhat.com \
--to=syoshida@redhat.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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
all inboxes | Powered by JetHome®