| Message ID | 20211207010638.124280-1-shinichiro.kawasaki@wdc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] scsi: scsi_debug: Fix buffer size of REPORT ZONES command | expand |
On 2021/12/07 10:06, Shin'ichiro Kawasaki wrote: > According to ZBC and SPC specifications, the unit of ALLOCATION LENGTH > field of REPORT ZONES command is byte. However, current scsi_debug > implementation handles it as number of zones to calculate buffer size to > report zones. When the ALLOCATION LENGTH has a large number, this > results in too large buffer size and causes memory allocation failure. > Fix the failure by handling ALLOCATION LENGTH as byte unit. > > Fixes: f0d1cf9378bd ("scsi: scsi_debug: Add ZBC zone commands") > Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> > --- > Changes from v1: > * Use kzalloc in place of kcalloc > > drivers/scsi/scsi_debug.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c > index 3c0da3770edf..2104973a35cd 100644 > --- a/drivers/scsi/scsi_debug.c > +++ b/drivers/scsi/scsi_debug.c > @@ -4342,7 +4342,7 @@ static int resp_report_zones(struct scsi_cmnd *scp, > rep_max_zones = min((alloc_len - 64) >> ilog2(RZONES_DESC_HD), > max_zones); > > - arr = kcalloc(RZONES_DESC_HD, alloc_len, GFP_ATOMIC); > + arr = kzalloc(alloc_len, GFP_ATOMIC); > if (!arr) { > mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC, > INSUFF_RES_ASCQ); > Looks good to me. Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
On Tue, 7 Dec 2021 10:06:38 +0900, Shin'ichiro Kawasaki wrote: > According to ZBC and SPC specifications, the unit of ALLOCATION LENGTH > field of REPORT ZONES command is byte. However, current scsi_debug > implementation handles it as number of zones to calculate buffer size to > report zones. When the ALLOCATION LENGTH has a large number, this > results in too large buffer size and causes memory allocation failure. > Fix the failure by handling ALLOCATION LENGTH as byte unit. > > [...] Applied to 5.16/scsi-fixes, thanks! [1/1] scsi: scsi_debug: Fix buffer size of REPORT ZONES command https://git.kernel.org/mkp/scsi/c/7db0e0c8190a
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 3c0da3770edf..2104973a35cd 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -4342,7 +4342,7 @@ static int resp_report_zones(struct scsi_cmnd *scp, rep_max_zones = min((alloc_len - 64) >> ilog2(RZONES_DESC_HD), max_zones); - arr = kcalloc(RZONES_DESC_HD, alloc_len, GFP_ATOMIC); + arr = kzalloc(alloc_len, GFP_ATOMIC); if (!arr) { mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC, INSUFF_RES_ASCQ);
According to ZBC and SPC specifications, the unit of ALLOCATION LENGTH field of REPORT ZONES command is byte. However, current scsi_debug implementation handles it as number of zones to calculate buffer size to report zones. When the ALLOCATION LENGTH has a large number, this results in too large buffer size and causes memory allocation failure. Fix the failure by handling ALLOCATION LENGTH as byte unit. Fixes: f0d1cf9378bd ("scsi: scsi_debug: Add ZBC zone commands") Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> --- Changes from v1: * Use kzalloc in place of kcalloc drivers/scsi/scsi_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)