You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.3 KiB
63 lines
2.3 KiB
From 5877c717b789339f1078213f9b1a4994d5498935 Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:37:19 -0500
|
|
Subject: [PATCH 062/139] [netdrv] net: atlantic: fix potential error handling
|
|
|
|
Message-id: <1604687916-15087-63-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338505
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 062/139] net: atlantic: fix potential error handling
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit 380ec5b9af7f0d57dbf6ac067fd9f33cff2fef71
|
|
Author: Pavel Belous <pbelous@marvell.com>
|
|
Date: Fri Feb 14 18:44:56 2020 +0300
|
|
|
|
net: atlantic: fix potential error handling
|
|
|
|
Code inspection found that in case of mapping error we do return current
|
|
'ret' value. But beside error, it is used to count number of descriptors
|
|
allocated for the packet. In that case map_skb function could return '1'.
|
|
|
|
Changing it to return zero (number of mapped descriptors for skb)
|
|
|
|
Fixes: 018423e90bee ("net: ethernet: aquantia: Add ring support code")
|
|
Signed-off-by: Pavel Belous <pbelous@marvell.com>
|
|
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
|
|
Signed-off-by: Dmitry Bogdanov <dbogdanov@marvell.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
|
|
index 263beea1859c..e95f6a6bef73 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
|
|
@@ -533,8 +533,10 @@ unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,
|
|
dx_buff->len,
|
|
DMA_TO_DEVICE);
|
|
|
|
- if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff->pa)))
|
|
+ if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff->pa))) {
|
|
+ ret = 0;
|
|
goto exit;
|
|
+ }
|
|
|
|
first = dx_buff;
|
|
dx_buff->len_pkt = skb->len;
|
|
--
|
|
2.13.6
|
|
|