scsi: scsi_ioctl: Validate command size
authorTadeusz Struk <tadeusz.struk@linaro.org>
Wed, 3 Nov 2021 17:06:58 +0000 (10:06 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 4 Nov 2021 02:02:52 +0000 (22:02 -0400)
Need to make sure the command size is valid before copying the command from
user space.

Link: https://lore.kernel.org/r/20211103170659.22151-1-tadeusz.struk@linaro.org
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: James E.J. Bottomley <jejb@linux.ibm.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Cc: <stable@vger.kernel.org> # 5.15, 5.14, 5.10
Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_ioctl.c

index 6ff2207..a06c61f 100644 (file)
@@ -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))