diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2009-11-03 21:33:07 +0300 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-01-18 19:48:05 +0300 |
| commit | e3deec090558d5cb5ffdc574e5560f3ed9723394 (patch) | |
| tree | c76a5e26a3e08598ada0a2de34adcdf714aa7168 /drivers/scsi/ses.c | |
| parent | 534ef056db8a8fb6b9d50188d88ed5d1fbc66673 (diff) | |
| download | linux-e3deec090558d5cb5ffdc574e5560f3ed9723394.tar.xz | |
[SCSI] eliminate potential kmalloc failure in scsi_get_vpd_page()
The best way to fix this is to eliminate the intenal kmalloc() and
make the caller allocate the required amount of storage.
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/ses.c')
| -rw-r--r-- | drivers/scsi/ses.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 55b034b72708..1d7a8780e00c 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c @@ -448,13 +448,17 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, .addr = 0, }; - buf = scsi_get_vpd_page(sdev, 0x83); - if (!buf) - return; + buf = kmalloc(INIT_ALLOC_SIZE, GFP_KERNEL); + if (!buf || scsi_get_vpd_page(sdev, 0x83, buf, INIT_ALLOC_SIZE)) + goto free; ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0); vpd_len = ((buf[2] << 8) | buf[3]) + 4; + kfree(buf); + buf = kmalloc(vpd_len, GFP_KERNEL); + if (!buf ||scsi_get_vpd_page(sdev, 0x83, buf, vpd_len)) + goto free; desc = buf + 4; while (desc < buf + vpd_len) { |