aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2017-03-29 10:10:30 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2017-03-29 10:10:30 -0400
commit0917ac4f5346d01cee1d568ff5dc0b99be02829e (patch)
tree6195542ea982d0ee813d4f7d0d33bad40dc4a1cc /drivers/scsi/sg.c
parentMerge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes (diff)
parentscsi: ufs: remove the duplicated checking for supporting clkscaling (diff)
downloadlinux-dev-0917ac4f5346d01cee1d568ff5dc0b99be02829e.tar.xz
linux-dev-0917ac4f5346d01cee1d568ff5dc0b99be02829e.zip
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r--drivers/scsi/sg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 29b86505f796..225abaad4d1c 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -996,6 +996,8 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
result = get_user(val, ip);
if (result)
return result;
+ if (val > SG_MAX_CDB_SIZE)
+ return -ENOMEM;
sfp->next_cmd_len = (val > 0) ? val : 0;
return 0;
case SG_GET_VERSION_NUM: