FAILED: patch "[PATCH] scsi: scsi_ioctl: Validate command size" failed to apply to 5.10-stable tree

Commit Message

Greg Kroah-Hartman Nov. 13, 2021, 11:29 a.m. UTC

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <[e-mail]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 20aaef52eb08f1d987d46ad26edb8f142f74d83a Mon Sep 17 00:00:00 2001
From: Tadeusz Struk <[e-mail]>
Date: Wed, 3 Nov 2021 10:06:58 -0700
Subject: [PATCH] scsi: scsi_ioctl: Validate command size

Need to make sure the command size is valid before copying the command from
user space.

Link: https://lore.kernel.org/r/[e-mail]
Cc: Bart Van Assche <[e-mail]>
Cc: Christoph Hellwig <[e-mail]>
Cc: James E.J. Bottomley <[e-mail]>
Cc: Martin K. Petersen <[e-mail]>
Cc: <[e-mail]>
Cc: <[e-mail]>
Cc: <[e-mail]> # 5.15, 5.14, 5.10
Signed-off-by: Tadeusz Struk <[e-mail]>
Signed-off-by: Martin K. Petersen <[e-mail]>

Patch

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 6ff2207bd45a..a06c61f22742 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -347,6 +347,8 @@  static int scsi_fill_sghdr_rq(struct scsi_device *sdev, struct request *rq,
 {
 	struct scsi_request *req = scsi_req(rq);
 
+	if (hdr->cmd_len < 6)
+		return -EMSGSIZE;
 	if (copy_from_user(req->cmd, hdr->cmdp, hdr->cmd_len))
 		return -EFAULT;
 	if (!scsi_cmd_allowed(req->cmd, mode))