From: michael.christie@oracle.com
To: Shigeru Yoshida <syoshida@redhat.com>, bvanassche@acm.org
Cc: jejb@linux.ibm.com, martin.petersen@oracle.com,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] scsi: sr: Fix a potential uninit-value in sr_get_events()
Date: Mon, 30 Oct 2023 10:02:24 -0500 [thread overview]
Message-ID: <6c3ed3dd-25e5-18b7-fd17-d126975b6b50@oracle.com> (raw)
In-Reply-To: <20231030.171317.1096475355592607869.syoshida@redhat.com>
On 10/30/23 3:13 AM, Shigeru Yoshida wrote:
> On Wed, 31 May 2023 15:44:17 -0700, Bart Van Assche wrote:
>> On 5/31/23 09:43, Shigeru Yoshida wrote:
>>> 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;
>>
>> I think this change is wrong because it introduces an unintended
>> behavior
>> change. A better solution is probably to zero-initialize sshdr before
>> scsi_execute_cmd() is called.
>
> Hi Bart,
>
> I'm very sorry for the very late response, and thank you so much for
> your feedback. I'll prepare the v2 patch as you suggested.
We actually just did this patch for the next kernel where we just
check result before accessing the sshdr:
https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git/commit/?h=6.7/scsi-staging&id=f7d7129c6c24168b9be7709b0b37767b5f743cf3
prev parent reply other threads:[~2023-10-30 15:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 16:43 Shigeru Yoshida
2023-05-31 22:44 ` Bart Van Assche
2023-10-30 8:13 ` Shigeru Yoshida
2023-10-30 15:02 ` michael.christie [this message]
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=6c3ed3dd-25e5-18b7-fd17-d126975b6b50@oracle.com \
--to=michael.christie@oracle.com \
--cc=bvanassche@acm.org \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=syoshida@redhat.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®