scsi_debug: fix in_use bitmap corruption
PATCH 1/1 scsi_debug: fix in_use bitmap corruption
Heavy testing indicates the irqsave() spinlock around the __set_bit() is insufficient to stop following clear_bit() calls being rarely applied out-of-order. Also the nearby failed kzalloc() path leading to SCSI_MLQUEUE_HOST_BUSY does not properly undo the in_use bitmap and num_in_q, fix.
Signed-off-by Douglas Gilbert <[email protected]>
--- drivers/scsi/scsi_debug.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +6 -3
@@ -5430,7 +5430,7 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,else return SCSI_MLQUEUE_HOST_BUSY ; } -__set_bit (k, sqp->in_use_bm); +set_bit (k, sqp->in_use_bm);atomic_inc (&devip->num_in_q); sqcp = &sqp->qc_arr[k]; sqcp->a_cmnd = cmnd;
@@ -5439,10 +5439,13 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip,spin_unlock_irqrestore (&sqp->qc_lock, iflags);if (unlikely (sdebug_every_nth && sdebug_any_injecting_opt))setup_inject (sqp, sqcp); -if (sd_dp ==NULL ) { +if (!sd_dp) { sd_dp =kzalloc (sizeof (*sd_dp),GFP_ATOMIC ); -if (sd_dp ==NULL ) +if (!sd_dp) { +atomic_dec (&devip->num_in_q); +clear_bit (k, sqp->in_use_bm);return SCSI_MLQUEUE_HOST_BUSY ; + } new_sd_dp = true; }else { new_sd_dp = false;
Signature · 1 line
2.25.1
Martin K. Petersen
AppliedQuoted 5 lines · Douglas Gilbert
Heavy testing indicates the
irqsave()spinlock around the__set_bit()is insufficient to stop followingclear_bit()calls being rarely applied out-of-order. Also the nearby failedkzalloc()path leading toSCSI_MLQUEUE_HOST_BUSYdoes not properly undo thein_usebitmap andnum_in_q, fix.
Applied to 5.9/scsi-queue, thanks!
[1/1] scsi: scsi_debug: Fix in_use bitmap corruption
https://git.kernel.org/mkp/scsi/c/74595c044cb5
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering