From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
stable@vger.kernel.org
Subject: [PATCH] scsi: Let scsi_execute_cmd() mark args->sshdr as invalid
Date: Thu, 11 May 2023 14:34:32 +0200 [thread overview]
Message-ID: <20230511123432.5793-1-jgross@suse.com> (raw)
Some callers of scsi_execute_cmd() (like e.g. sd_spinup_disk()) are
passing an uninitialized struct sshdr and don't look at the return
value of scsi_execute_cmd() before looking at the contents of that
struct.
This can result in false positives when looking for specific error
conditions.
In order to fix that let scsi_execute_cmd() zero sshdr->response_code,
resulting in scsi_sense_valid() returning false.
Cc: stable@vger.kernel.org
Fixes: 3949e2f04262 ("scsi: simplify scsi_execute_req_flags")
Signed-off-by: Juergen Gross <jgross@suse.com>
---
I'm not aware of any real error having happened due to this problem,
but I thought it should be fixed anyway.
I _think_ 3949e2f04262 was introducing the problem, but I'm not 100%
sure it is really the commit to be blamed.
---
drivers/scsi/scsi_lib.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b7c569a42aa4..923336620bff 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -209,11 +209,17 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
struct scsi_cmnd *scmd;
int ret;
- if (!args)
+ if (!args) {
args = &default_args;
- else if (WARN_ON_ONCE(args->sense &&
- args->sense_len != SCSI_SENSE_BUFFERSIZE))
- return -EINVAL;
+ } else {
+ /* Mark sense data to be invalid. */
+ if (args->sshdr)
+ args->sshdr->response_code = 0;
+
+ if (WARN_ON_ONCE(args->sense &&
+ args->sense_len != SCSI_SENSE_BUFFERSIZE))
+ return -EINVAL;
+ }
req = scsi_alloc_request(sdev->request_queue, opf, args->req_flags);
if (IS_ERR(req))
--
2.35.3
next reply other threads:[~2023-05-11 12:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-11 12:34 Juergen Gross [this message]
2023-05-11 12:49 ` [PATCH] scsi: Let scsi_execute_cmd() mark args->sshdr as invalid Bart Van Assche
2023-05-11 12:54 ` Juergen Gross
2023-05-11 13:10 ` Martin Wilck
2023-05-11 13:17 ` Juergen Gross
2023-05-11 13:23 ` Martin Wilck
2023-05-11 13:32 ` Juergen Gross
2023-05-11 15:59 ` Martin Wilck
2023-05-11 16:00 ` Martin Wilck
2023-05-17 2:06 ` Martin K. Petersen
2023-05-17 4:54 ` Juergen Gross
2023-05-17 15:05 ` John Garry
2023-05-18 4:53 ` Juergen Gross
2023-05-18 10:57 ` John Garry
2023-05-18 19:54 ` Bart Van Assche
2023-05-19 16:06 ` John Garry
2023-05-19 16:54 ` Bart Van Assche
2023-05-19 17:12 ` John Garry
2023-05-19 17:39 ` Bart Van Assche
2023-05-22 9:55 ` John Garry
2023-05-22 13:31 ` Bart Van Assche
2023-05-22 15:54 ` John Garry
2023-05-22 22:48 ` michael.christie
2023-05-21 1:19 ` Martin K. Petersen
2023-05-21 5:23 ` Juergen Gross
2023-05-22 22:26 ` Martin K. Petersen
2023-05-23 15:04 ` Mike Christie
2023-05-21 0:46 ` Martin K. Petersen
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=20230511123432.5793-1-jgross@suse.com \
--to=jgross@suse.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stable@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