| Message ID | 20220125231033.GA79247@embeddedor |
|---|---|
| State | New |
| Headers | show |
| Series | [next] scsi: core: Use struct_size() helper in kmalloc() | expand |
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 211aace69c22..949cb530e360 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -387,7 +387,7 @@ static struct scsi_vpd *scsi_get_vpd_buf(struct scsi_device *sdev, u8 page) int vpd_len = SCSI_VPD_PG_LEN, result; retry_pg: - vpd_buf = kmalloc(sizeof(*vpd_buf) + vpd_len, GFP_KERNEL); + vpd_buf = kmalloc(struct_size(vpd_buf, data, vpd_len), GFP_KERNEL); if (!vpd_buf) return NULL;
Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows. Also, address the following sparse warnings: drivers/scsi/scsi.c:390:27: warning: using sizeof on a flexible structure Link: https://github.com/KSPP/linux/issues/174 Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- drivers/scsi/scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)