Skip to contentSkip to conversation

drivers/net: release skb on failure

PATCH In review Navid Emamdoost 2 participants 2 messages Sep 18, 2019 – Sep 21, 2019

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

PATCH 1/1 drivers/net: release skb on failure

In ql_run_loopback_test, ql_lb_send does not release skb when fails. So it must be released before returning.

---
 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +3 -1
index a6886cc5654c..d539b71b2a5c 100644
@@ -544,8 +544,10 @@ static int ql_run_loopback_test(struct ql_adapter *qdev)
 		skb_put(skb, size);
 		ql_create_lb_frame(skb, size);
 		rc = ql_lb_send(skb, qdev->ndev);
-		if (rc != NETDEV_TX_OK)
+		if (rc != NETDEV_TX_OK) {
+			dev_kfree_skb_any(skb);
 			return -EPIPE;
+		}
 		atomic_inc(&qdev->lb_count);
 	}
 	/* Give queue time to settle before testing results. */
Signature · 1 line
2.17.1
#1 lore raw
Quoted 6 lines · Navid Emamdoost

In ql_run_loopback_test, ql_lb_send does not release skb when fails. So it must be released before returning.

---
 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 +++-

Thanks for the patch, this driver has been moved, please see

commit 955315b0dc8c8641311430f40fbe53990ba40e33

Author: Benjamin Poirier <[email protected]>
Date:   Tue Jul 23 15:14:13 2019 +0900

qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/staging/qlge/
The hardware has been declared EOL by the vendor more than 5 years ago. What's more relevant to the Linux kernel is that the quality of this driver is not on par with many other mainline drivers.

Cc: Manish Chopra <[email protected]>
Message-id: <[email protected]>

Could you rebase, and send the new version to GregKH as he is the stable maintainer?

Quoted 18 lines
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +3 -1
index a6886cc5654c..d539b71b2a5c 100644
@@ -544,8 +544,10 @@ static int ql_run_loopback_test(struct ql_adapter *qdev)
 		skb_put(skb, size);
 		ql_create_lb_frame(skb, size);
 		rc = ql_lb_send(skb, qdev->ndev);
-		if (rc != NETDEV_TX_OK)
+		if (rc != NETDEV_TX_OK) {
+			dev_kfree_skb_any(skb);
 			return -EPIPE;
+		}
 		atomic_inc(&qdev->lb_count);
 	}
 	/* Give queue time to settle before testing results. */