| From b54ae1d73b1ce3fcfe19fd272dff316772380114 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 29 Jan 2026 15:53:32 +0000 |
| Subject: scsi: csiostor: Fix dereference of null pointer rn |
| |
| From: Colin Ian King <colin.i.king@gmail.com> |
| |
| [ Upstream commit 1982257570b84dc33753d536dd969fd357a014e9 ] |
| |
| The error exit path when rn is NULL ends up deferencing the null pointer rn |
| via the use of the macro CSIO_INC_STATS. Fix this by adding a new error |
| return path label after the use of the macro to avoid the deference. |
| |
| Fixes: a3667aaed569 ("[SCSI] csiostor: Chelsio FCoE offload driver") |
| Signed-off-by: Colin Ian King <colin.i.king@gmail.com> |
| Link: https://patch.msgid.link/20260129155332.196338-1-colin.i.king@gmail.com |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/csiostor/csio_scsi.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c |
| index 34bde6650fae0..356a7c577ec3e 100644 |
| --- a/drivers/scsi/csiostor/csio_scsi.c |
| +++ b/drivers/scsi/csiostor/csio_scsi.c |
| @@ -2074,7 +2074,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) |
| struct csio_scsi_level_data sld; |
| |
| if (!rn) |
| - goto fail; |
| + goto fail_ret; |
| |
| csio_dbg(hw, "Request to reset LUN:%llu (ssni:0x%x tgtid:%d)\n", |
| cmnd->device->lun, rn->flowid, rn->scsi_id); |
| @@ -2220,6 +2220,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) |
| csio_put_scsi_ioreq_lock(hw, scsim, ioreq); |
| fail: |
| CSIO_INC_STATS(rn, n_lun_rst_fail); |
| +fail_ret: |
| return FAILED; |
| } |
| |
| -- |
| 2.51.0 |
| |
