diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:21 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:21 -0700 |
| commit | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (patch) | |
| tree | fc1ed011273f1f503570b3595f018eb84b3872a1 /drivers/scsi/sg.c | |
| parent | 4dddf720534a9a14fa9b048e7930dcc55b1b1e40 (diff) | |
| parent | 4d869de174c78ae29ca91b41581367c8092d933d (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.09-android
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index eb81c98386b9..721d839d6c54 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1694,6 +1694,9 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd) md->from_user = 0; } + if (unlikely(iov_count > UIO_MAXIOV)) + return -EINVAL; + if (iov_count) { int len, size = sizeof(struct sg_iovec) * iov_count; struct iovec *iov; |