From: "zhengbin (A)" <zhengbin13@huawei.com>
To: Bart Van Assche <bvanassche@acm.org>, <jejb@linux.ibm.com>,
<martin.petersen@oracle.com>, <linux-scsi@vger.kernel.org>
Cc: <yi.zhang@huawei.com>
Subject: Re: [PATCH v3] scsi: core: fix uninit-value access of variable sshdr
Date: Thu, 17 Oct 2019 11:26:00 +0800 [thread overview]
Message-ID: <eb7310f0-ec09-0ed9-c19d-c52cf0d62f0c@huawei.com> (raw)
In-Reply-To: <3e3f05fb-387a-d55f-fc90-72d01c6d026a@acm.org>
On 2019/10/17 10:45, Bart Van Assche wrote:
> On 2019-10-11 20:25, zhengbin wrote:
>> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
>> index 5447738..d5e29c5 100644
>> --- a/drivers/scsi/scsi_lib.c
>> +++ b/drivers/scsi/scsi_lib.c
>> @@ -255,6 +255,13 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
>> struct scsi_request *rq;
>> int ret = DRIVER_ERROR << 24;
>>
>> + /*
>> + * Zero-initialize sshdr for those callers that check the *sshdr
>> + * contents even if no sense data is available.
>> + */
>> + if (sshdr)
>> + memset(sshdr, 0, sizeof(struct scsi_sense_hdr));
>> +
>> req = blk_get_request(sdev->request_queue,
>> data_direction == DMA_TO_DEVICE ?
>> REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, BLK_MQ_REQ_PREEMPT);
> Although I don't have a strong opinion about this, I'm still wondering
> whether 'sshdr' should be initialized in __scsi_execute() or by its caller.
@jejb, @martin, any suggestion?
>
>> diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
>> index ffcf902..335cfdd 100644
>> --- a/drivers/scsi/sr_ioctl.c
>> +++ b/drivers/scsi/sr_ioctl.c
>> @@ -206,6 +206,11 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
>>
>> /* Minimal error checking. Ignore cases we know about, and report the rest. */
>> if (driver_byte(result) != 0) {
>> + if (!scsi_sense_valid(sshdr)) {
>> + err = -EIO;
>> + goto out;
>> + }
>> +
>> switch (sshdr->sense_key) {
>> case UNIT_ATTENTION:
>> SDev->changed = 1;
> Shouldn't this be a separate patch?
OK, will send a separate patch
>
> Thanks,
>
> Bart.
>
> .
>
prev parent reply other threads:[~2019-10-17 3:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-12 3:25 [PATCH v3] scsi: core: fix uninit-value access of variable sshdr zhengbin
2019-10-17 0:05 ` Finn Thain
2019-10-17 1:16 ` zhengbin (A)
2019-10-17 2:45 ` Bart Van Assche
2019-10-17 3:26 ` zhengbin (A) [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=eb7310f0-ec09-0ed9-c19d-c52cf0d62f0c@huawei.com \
--to=zhengbin13@huawei.com \
--cc=bvanassche@acm.org \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=yi.zhang@huawei.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;
as well as URLs for NNTP newsgroup(s).