diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-01-17 15:27:12 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-17 15:27:12 -0500 |
| commit | aef38e0294628a51cae1adf8d95f9fd2e55b179d (patch) | |
| tree | 29def202413053cfdbe60c78f1efe2bc20e299fd /drivers/scsi/aacraid/commctrl.c | |
| parent | f53d630d9ec8d3a198df235aefde5e135727b74f (diff) | |
| parent | 260716c872b0d2702ebf15c9228c6e86e0ea404a (diff) | |
Merge tag 'v3.2.54' into v3.2-rt
This is the 3.2.54 stable release
Diffstat (limited to 'drivers/scsi/aacraid/commctrl.c')
| -rw-r--r-- | drivers/scsi/aacraid/commctrl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index 8a0b33033177..1254431d3053 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c @@ -508,7 +508,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) goto cleanup; } - if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr))) { + if ((fibsize < (sizeof(struct user_aac_srb) - sizeof(struct user_sgentry))) || + (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))) { rcode = -EINVAL; goto cleanup; } |