netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Greg Rose <gregory.v.rose@intel.com>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 09/12] igbvf: Check for error on dma_map_single call
Date: Fri, 26 Oct 2012 17:08:35 -0700	[thread overview]
Message-ID: <1351296518-31174-10-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1351296518-31174-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Greg Rose <gregory.v.rose@intel.com>

Ignoring the return value from a call to the kernel dma_map API functions
can cause data corruption and system instability.  Check the return value
and take appropriate action.

Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/igbvf/netdev.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 0ac11f5..4051ec4 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -184,6 +184,13 @@ static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring,
 				             buffer_info->page_offset,
 				             PAGE_SIZE / 2,
 					     DMA_FROM_DEVICE);
+			if (dma_mapping_error(&pdev->dev,
+					      buffer_info->page_dma)) {
+				__free_page(buffer_info->page);
+				buffer_info->page = NULL;
+				dev_err(&pdev->dev, "RX DMA map failed\n");
+				break;
+			}
 		}
 
 		if (!buffer_info->skb) {
@@ -197,6 +204,12 @@ static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring,
 			buffer_info->dma = dma_map_single(&pdev->dev, skb->data,
 			                                  bufsz,
 							  DMA_FROM_DEVICE);
+			if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
+				dev_kfree_skb(buffer_info->skb);
+				buffer_info->skb = NULL;
+				dev_err(&pdev->dev, "RX DMA map failed\n");
+				goto no_buffers;
+			}
 		}
 		/* Refresh the desc even if buffer_addrs didn't change because
 		 * each write-back erases this info. */
-- 
1.7.11.7

  parent reply	other threads:[~2012-10-27  0:08 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-27  0:08 [net-next v2 00/12][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-10-27  0:08 ` [net-next 01/12] ixgbe: Add support for pipeline reset Jeff Kirsher
2012-10-27  0:08 ` [net-next 02/12] ixgbe: Fix return value from macvlan filter function Jeff Kirsher
2012-10-27 18:36   ` Konstantin Stepanyuk
2012-10-29 16:27     ` Rose, Gregory V
2012-10-27  0:08 ` [net-next 03/12] net, ixgbe: handle link local multicast addresses in SR-IOV mode Jeff Kirsher
2012-10-27  0:08 ` [net-next 04/12] ixgbe: clean up the condition for turning on/off the laser Jeff Kirsher
2012-10-27  0:08 ` [net-next 05/12] ixgbe: Return success or failure on VF MAC filter set Jeff Kirsher
2012-10-27  0:08 ` [net-next 06/12] ixgbe: Do not decrement budget in ixgbe_clean_rx_irq Jeff Kirsher
2012-10-27  0:08 ` [net-next 07/12] ixgbe: add/update descriptor maps in comments Jeff Kirsher
2012-10-27  0:08 ` [net-next 08/12] ixgbevf: Do not forward LLDP type frames Jeff Kirsher
2012-10-27  0:08 ` Jeff Kirsher [this message]
2012-10-27  0:08 ` [net-next 10/12] igb: Enable auto-crossover during forced operation on 82580 and above Jeff Kirsher
2012-10-27  0:08 ` [net-next 11/12] igb: Update firmware version info for ethtool output Jeff Kirsher
2012-10-27  0:08 ` [net-next 12/12] igb: Fix sparse warning in igb_ptp_rx_pktstamp Jeff Kirsher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1351296518-31174-10-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=gregory.v.rose@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).