diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-12 21:13:59 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-12 21:13:59 +0400 |
| commit | fa8c4bd898c720c5a2186c9c8cb7cf80885aa6df (patch) | |
| tree | 4f70fd5bae3a6e895b96e3dcca4a26c9917ebd9b /drivers/scsi/ibmvscsi | |
| parent | 99542137b908ab89180986de6fb75532ad765688 (diff) | |
| parent | c6092bb74442d4ee1dfea60e2934915836f53528 (diff) | |
Merge branch 'tracking-linux-3.6.y' into merge-linux-linaro-core-trackingllct-20121012.0linux-linaro-core-tracking-3.6-2012.10
Diffstat (limited to 'drivers/scsi/ibmvscsi')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 3a6c4742951e..337e8b33d9aa 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -1541,6 +1541,9 @@ static int ibmvscsi_do_host_config(struct ibmvscsi_host_data *hostdata, host_config = &evt_struct->iu.mad.host_config; + /* The transport length field is only 16-bit */ + length = min(0xffff, length); + /* Set up a lun reset SRP command */ memset(host_config, 0x00, sizeof(*host_config)); host_config->common.type = VIOSRP_HOST_CONFIG_TYPE; |