Skip to contentSkip to conversation

Patch "fnic: pci_dma_mapping_error() doesn't return an error code" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

fnic: pci_dma_mapping_error() doesn't return an error code

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
fnic-pci_dma_mapping_error-doesn-t-return-an-error-code.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From dd7328e4c53649c1c7ec36bc1cf5b229b8662047 Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Thu, 7 Jul 2016 11:23:59 +0300
Subject: fnic: pci_dma_mapping_error() doesn't return an error code

From: Dan Carpenter <[email protected]>

commit dd7328e4c53649c1c7ec36bc1cf5b229b8662047 upstream.

pci_dma_mapping_error() returns true on error and false on success.

Fixes fd6ddfa4c1dd ('fnic: check pci_map_single() return value')
---
 drivers/scsi/fnic/fnic_fcs.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/fnic/fnic_fcs.c +4 -4
@@ -954,8 +954,8 @@ int fnic_alloc_rq_frame(struct vnic_rq *
 	skb_put(skb, len);
 	pa = pci_map_single(fnic->pdev, skb->data, len, PCI_DMA_FROMDEVICE);
 
-	r = pci_dma_mapping_error(fnic->pdev, pa);
-	if (r) {
+	if (pci_dma_mapping_error(fnic->pdev, pa)) {
+		r = -ENOMEM;
 		printk(KERN_ERR "PCI mapping failed with error %d\n", r);
 		goto free_skb;
 	}
@@ -1093,8 +1093,8 @@ static int fnic_send_frame(struct fnic *
 
 	pa = pci_map_single(fnic->pdev, eth_hdr, tot_len, PCI_DMA_TODEVICE);
 
-	ret = pci_dma_mapping_error(fnic->pdev, pa);
-	if (ret) {
+	if (pci_dma_mapping_error(fnic->pdev, pa)) {
+		ret = -ENOMEM;
 		printk(KERN_ERR "DMA map failed with error %d\n", ret);
 		goto free_skb_on_err;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/fnic-pci_dma_mapping_error-doesn-t-return-an-error-code.patch queue-4.4/dmaengine-at_xdmac-fix-debug-string.patch queue-4.4/mmc-pxamci-fix-potential-oops.patch queue-4.4/avr32-off-by-one-in-at32_init_pio.patch queue-4.4/tools-vm-slabinfo-fix-an-unintentional-printf.patch queue-4.4/em28xx-i2c-rt_mutex_trylock-returns-zero-on-failure.patch queue-4.4/usb-gadget-fsl_qe_udc-signedness-bug-in-qe_get_frame.patch