Skip to contentSkip to conversation

scsi: fnic: fix missing dma mapping error in `fnic_send_frame()`

PATCH Applied Thomas Fourier 4 participants 4 messages Jun 18, 2025 – Jun 20, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: fnic: fix missing dma mapping error in `fnic_send_frame()`

dma_map_XXX() can fail and should be tested for errors with dma_mapping_error().

Fixes a63e78eb2b0f ("scsi: fnic: Add support for fabric based solicited requests and responses")
---
 drivers/scsi/fnic/fnic_fcs.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/scsi/fnic/fnic_fcs.c +2 -0
index 1e8cd64f9a5c..103ab6f1f7cd 100644
@@ -636,6 +636,8 @@ static int fnic_send_frame(struct fnic *fnic, void *frame, int frame_len)
 	unsigned long flags;
 
 	pa = dma_map_single(&fnic->pdev->dev, frame, frame_len, DMA_TO_DEVICE);
+	if (dma_mapping_error(&fnic->pdev->dev, pa))
+		return -ENOMEM;
 
 	if ((fnic_fc_trace_set_data(fnic->fnic_num,
 				FNIC_FC_SEND | 0x80, (char *) frame,
Signature · 1 line
2.43.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Thomas Fourier

dma_map_XXX() can fail and should be tested for errors with dma_mapping_error().

Fixes a63e78eb2b0f ("scsi: fnic: Add support for fabric based solicited requests and responses")

---
drivers/scsi/fnic/fnic_fcs.c | 2 ++

1 file changed, 2 insertions(+)
drivers/scsi/fnic/fnic_fcs.c +2 -1
index 1e8cd64f9a5c..103ab6f1f7cd 100644
@@ -636,6 +636,8 @@ static int fnic_send_frame(struct fnic *fnic, void *frame, int frame_len)
 unsigned long flags;
 
 pa = dma_map_single(&fnic->pdev->dev, frame, frame_len, DMA_TO_DEVICE);
+     if (dma_mapping_error(&fnic->pdev->dev, pa))
+             return -ENOMEM;
 
 if ((fnic_fc_trace_set_data(fnic->fnic_num,
 FNIC_FC_SEND | 0x80, (char *) frame,
--
Quoted 3 lines

2.43.0

Looks good to me.

Regards,
Karan

Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Fourier

Martin, can we get this merged into 6.16/scsi-fixes as well?

/John

Quoted 22 lines · Thomas Fourier

dma_map_XXX() can fail and should be tested for errors with dma_mapping_error().

Fixes a63e78eb2b0f ("scsi: fnic: Add support for fabric based solicited requests and responses")
---
  drivers/scsi/fnic/fnic_fcs.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/scsi/fnic/fnic_fcs.c +2 -0
index 1e8cd64f9a5c..103ab6f1f7cd 100644
@@ -636,6 +636,8 @@ static int fnic_send_frame(struct fnic *fnic, void *frame, int frame_len)
  	unsigned long flags;
 
  	pa = dma_map_single(&fnic->pdev->dev, frame, frame_len, DMA_TO_DEVICE);
+	if (dma_mapping_error(&fnic->pdev->dev, pa))
+		return -ENOMEM;
 
  	if ((fnic_fc_trace_set_data(fnic->fnic_num,
  				FNIC_FC_SEND | 0x80, (char *) frame,