dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

dm: scsi: fix divide-by-0 error in scsi_scan()

Browse Source 
With DM_SCSI enabled, blk_create_devicef() is called with blkz = 0, leading
to a divide-by-0 exception.
scsi_detect_dev() can be used to get the required parameters (block size
and number of blocks) from the drive before calling blk_create_devicef().

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Jean-Jacques Hiblot
2017-04-07 13:42:08 +02:00
committed by Simon Glass
parent 1330a726ff
commit 4e27b9a584
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/scsi.c
View File

@@ -580,9 +580,19 @@ int scsi_scan(int mode)
for (lun = 0; lun < plat->max_lun; lun++) { for (lun = 0; lun < plat->max_lun; lun++) {
struct udevice *bdev; /* block device */ struct udevice *bdev; /* block device */
/* block device description */ /* block device description */
struct blk_desc _bd;
struct blk_desc *bdesc; struct blk_desc *bdesc;
char str[10]; char str[10];
scsi_init_dev_desc_priv(&_bd);
ret = scsi_detect_dev(i, lun, &_bd);
if (ret)
/*
* no device detected?
* check the next lun.
*/
continue;
/* /*
* Create only one block device and do detection * Create only one block device and do detection
* to make sure that there won't be a lot of * to make sure that there won't be a lot of
@@ -591,19 +601,26 @@ int scsi_scan(int mode)
snprintf(str, sizeof(str), "id%dlun%d", i, lun); snprintf(str, sizeof(str), "id%dlun%d", i, lun);
ret = blk_create_devicef(dev, "scsi_blk", ret = blk_create_devicef(dev, "scsi_blk",
str, IF_TYPE_SCSI, str, IF_TYPE_SCSI,
-1, 0, 0, &bdev); -1,
_bd.blksz,
_bd.blksz * _bd.lba,
&bdev);
if (ret) { if (ret) {
debug("Can't create device\n"); debug("Can't create device\n");
return ret; return ret;
} }
bdesc = dev_get_uclass_platdata(bdev);
scsi_init_dev_desc_priv(bdesc); bdesc = dev_get_uclass_platdata(bdev);
ret = scsi_detect_dev(i, lun, bdesc); bdesc->target = i;
if (ret) { bdesc->lun = lun;
device_unbind(bdev); bdesc->removable = _bd.removable;
continue; bdesc->type = _bd.type;
} memcpy(&bdesc->vendor, &_bd.vendor,
sizeof(_bd.vendor));
memcpy(&bdesc->product, &_bd.product,
sizeof(_bd.product));
memcpy(&bdesc->revision, &_bd.revision,
sizeof(_bd.revision));
part_init(bdesc); part_init(bdesc);
if (mode == 1) { if (mode == 1) {