summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2013-08-09 11:16:34 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-14 06:54:54 -0700
commit6c1a4bb872100c852b07480396744608278dd9ee (patch)
tree16da5692e1439703a50a2d66915dcceab1d3bb36
parent27c1c98bd3b44b7c5f5c0ecfe1a1ec1240b73829 (diff)
downloadlinux-3.10-6c1a4bb872100c852b07480396744608278dd9ee.tar.gz
linux-3.10-6c1a4bb872100c852b07480396744608278dd9ee.tar.bz2
linux-3.10-6c1a4bb872100c852b07480396744608278dd9ee.zip
8139cp: Fix skb leak in rx_status_loop failure path.
[ Upstream commit d06f5187469eee1b2932c02fd093d113cfc60d5e ] Introduced in cf3c4c03060b688cbc389ebc5065ebcce5653e96 ("8139cp: Add dma_mapping_error checking") Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 887aebea298..9095ff930f2 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -524,6 +524,7 @@ rx_status_loop:
PCI_DMA_FROMDEVICE);
if (dma_mapping_error(&cp->pdev->dev, new_mapping)) {
dev->stats.rx_dropped++;
+ kfree_skb(new_skb);
goto rx_next;
}