diff options
author | Scott Teel <scott.teel@hp.com> | 2011-10-26 16:21:12 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-30 14:34:04 +0400 |
commit | b7ec021fe6fe979dbd4e62604a4942f964b12864 (patch) | |
tree | 1fb695d21736aa12d6144fcd373aee9fe1b6dc54 /drivers/scsi/hpsa.h | |
parent | cfe5badcab2e993e71ebebbc07c21c270e5580c0 (diff) | |
download | op-kernel-dev-b7ec021fe6fe979dbd4e62604a4942f964b12864.zip op-kernel-dev-b7ec021fe6fe979dbd4e62604a4942f964b12864.tar.gz |
[SCSI] hpsa: fix potential array overflow in hpsa_update_scsi_devices
The currentsd[] array in hpsa_update_scsi_devices had room for
256 devices. The code was iterating over however many physical
and logical devices plus an additional number of possible external
MSA2XXX controllers, which together could potentially exceed 256.
We increased the size of the currentsd array to 1024 + 1024 + 32 + 1
elements to reflect a reasonable maximum possible number of devices
which might be encountered. We also don't just walk off the end
of the array if the array controller reports more devices than we
are prepared to handle, we just ignore the excessive devices.
Signed-off-by: Scott Teel <scott.teel@hp.com>
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/hpsa.h')
-rw-r--r-- | drivers/scsi/hpsa.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index 4de9f71..73858bc 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -102,7 +102,6 @@ struct ctlr_info { struct Scsi_Host *scsi_host; spinlock_t devlock; /* to protect hba[ctlr]->dev[]; */ int ndevices; /* number of used elements in .dev[] array. */ -#define HPSA_MAX_DEVICES 256 struct hpsa_scsi_dev_t *dev[HPSA_MAX_DEVICES]; /* * Performant mode tables. |