Skip to contentSkip to conversation

iavf: fix two memory leaks

PATCH In review [email protected] 3 participants 7 messages Jul 15 – Jul 23

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

v2 cover iavf: fix two memory leaks

From: Xuanqiang Luo <[email protected]>

This series fixes two memory leaks found by inspection in iavf. Release the ASQ command buffer when initialization fails and the QoS capabilities buffer when the device is removed.

---
Changes:
v2:
Patch1:
- Move the ASQ command buffer cleanup into iavf_free_adminq_asq() to pair it with iavf_alloc_adminq_asq_ring(). (Suggested by Jedrzej.)

v1: https://lore.kernel.org/all/[email protected]/

Xuanqiang Luo (2):
iavf: fix ASQ command buffer leak on init failure
iavf: fix QoS capabilities memory leak

 drivers/net/ethernet/intel/iavf/iavf_adminq.c | 1 +
 drivers/net/ethernet/intel/iavf/iavf_main.c   | 1 +
 2 files changed, 2 insertions(+)

base-commit: 58717b2a1365d06c8c64b72aa948541b53fe31eb

Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 1/2 iavf: fix ASQ command buffer leak on init failure

From: Xuanqiang Luo <[email protected]>

iavf_alloc_adminq_asq_ring() allocates cmd_buf before the remaining ASQ resources. If iavf_alloc_asq_bufs() or iavf_config_asq_regs() fails, the unwind path elides cmd_buf while freeing the other allocations.

The ASQ count is not set until initialization succeeds, so the shutdown path cannot reclaim the buffer. Free cmd_buf in the common unwind path.

Fixes d358aa9a7a2d ("i40evf: init code and hardware support")
---
 drivers/net/ethernet/intel/iavf/iavf_adminq.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/iavf/iavf_adminq.c +1 -0
index 6937b7dd44cbb..40f76f9507f4b 100644
@@ -60,6 +60,7 @@ static enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)
  **/
 static void iavf_free_adminq_asq(struct iavf_hw *hw)
 {
+	iavf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
 	iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);
 }
 
Signature · 1 line
2.43.0
Reviewed-by on v2 1/2
#2 lore raw

RE: [PATCH iwl-net v2 1/2] iavf: fix ASQ command buffer leak on init failure

From: [email protected] <[email protected]>
Sent: Wednesday, July 15, 2026 10:26 AM

Quoted 30 lines

From: Xuanqiang Luo <[email protected]>

iavf_alloc_adminq_asq_ring() allocates cmd_buf before the remaining ASQ resources. If iavf_alloc_asq_bufs() or iavf_config_asq_regs() fails, the unwind path elides cmd_buf while freeing the other allocations.

The ASQ count is not set until initialization succeeds, so the shutdown path cannot reclaim the buffer. Free cmd_buf in the common unwind path.

Fixes d358aa9a7a2d ("i40evf: init code and hardware support")

---
drivers/net/ethernet/intel/iavf/iavf_adminq.c | 1 +

1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/iavf/iavf_adminq.c +1 -0
index 6937b7dd44cbb..40f76f9507f4b 100644
@@ -60,6 +60,7 @@ static enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)
 **/
 static void iavf_free_adminq_asq(struct iavf_hw *hw)
 {
+	iavf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
 	iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);
 }
 
Signature · 1 line
2.43.0

Looks fine, thanks!

One note for the future - please be aware that there is minimal time period to be waited before resubmitting new patch revision, which is at least 24h for netdev/IWL mailing lists

#3 lore raw

Re: [PATCH iwl-net v2 1/2] iavf: fix ASQ command buffer leak on init failure

Quoted 35 lines · Jedrzej

From: [email protected] <[email protected]>
Sent: Wednesday, July 15, 2026 10:26 AM

Quoted 30 lines

From: Xuanqiang Luo <[email protected]>

iavf_alloc_adminq_asq_ring() allocates cmd_buf before the remaining ASQ resources. If iavf_alloc_asq_bufs() or iavf_config_asq_regs() fails, the unwind path elides cmd_buf while freeing the other allocations.

The ASQ count is not set until initialization succeeds, so the shutdown path cannot reclaim the buffer. Free cmd_buf in the common unwind path.

Fixes d358aa9a7a2d ("i40evf: init code and hardware support")

---
drivers/net/ethernet/intel/iavf/iavf_adminq.c | 1 +

1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/iavf/iavf_adminq.c +1 -0
index 6937b7dd44cbb..40f76f9507f4b 100644
@@ -60,6 +60,7 @@ static enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)
  **/
 static void iavf_free_adminq_asq(struct iavf_hw *hw)
 {
+	iavf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
 	iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);
 }
 
Signature · 1 line
2.43.0

Looks fine, thanks!

Quoted 5 lines

One note for the future - please be aware that there is minimal time period to be waited before resubmitting new patch revision, which is at least 24h for netdev/IWL mailing lists

Thanks for the reminder!

I also received a notification from netdev-bot, and I'll keep this in mind for future revisions.

Reviewed-by on v2 1/2
#4 lore raw

RE: [Intel-wired-lan] [PATCH iwl-net v2 1/2] iavf: fix ASQ command buffer leak on init failure

In reply to [email protected]
Quoted 49 lines

-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of [email protected]
Sent: Wednesday, July 15, 2026 10:26 AM
To: Nguyen, Anthony L <[email protected]>; Kitszel, Przemyslaw <[email protected]>; Jagielski; Jagielski, Jedrzej <[email protected]>; intel-wired- [email protected]
Cc: Andrew Lunn <[email protected]>; Mitch Williams <[email protected]>; Greg Rose <[email protected]>; Sudheer Mogilappagari <[email protected]>; [email protected]; Xuanqiang Luo <[email protected]>; [email protected]
Subject: [Intel-wired-lan] [PATCH iwl-net v2 1/2] iavf: fix ASQ command buffer leak on init failure

From: Xuanqiang Luo <[email protected]>

iavf_alloc_adminq_asq_ring() allocates cmd_buf before the remaining ASQ resources. If iavf_alloc_asq_bufs() or iavf_config_asq_regs() fails, the unwind path elides cmd_buf while freeing the other allocations.

The ASQ count is not set until initialization succeeds, so the shutdown path cannot reclaim the buffer. Free cmd_buf in the common unwind path.

Fixes d358aa9a7a2d ("i40evf: init code and hardware support")
---
 drivers/net/ethernet/intel/iavf/iavf_adminq.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/iavf/iavf_adminq.c +1 -1
index 6937b7dd44cbb..40f76f9507f4b 100644
@@ -60,6 +60,7 @@ static enum iavf_status
 iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)
  **/
 static void iavf_free_adminq_asq(struct iavf_hw *hw)  {
+	iavf_free_virt_mem(hw, &hw->aq.asq.cmd_buf);
 	iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);  }
 
--
Quoted 1 line

2.43.0

#5 lore raw

PATCH v2 2/2 iavf: fix QoS capabilities memory leak

In reply to [email protected]

From: Xuanqiang Luo <[email protected]>

Commit 4c1a457cb8b0 ("iavf: add support to exchange qos capabilities") allocates adapter->qos_caps during probe, but iavf_remove() does not free it. This leaks the allocation whenever an iavf device is removed.

Free adapter->qos_caps in iavf_remove().

Fixes 4c1a457cb8b0 ("iavf: add support to exchange qos capabilities")
---
 drivers/net/ethernet/intel/iavf/iavf_main.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/iavf/iavf_main.c +1 -0
index 29b8403a066bc..c7f69a9040588 100644
@@ -5589,6 +5589,7 @@ static void iavf_remove(struct pci_dev *pdev)
 	iounmap(hw->hw_addr);
 	pci_release_regions(pdev);
 	kfree(adapter->vf_res);
+	kfree(adapter->qos_caps);
 	spin_lock_bh(&adapter->mac_vlan_list_lock);
 	/* If we got removed before an up/down sequence, we've got a filter
 	 * hanging out there that we need to get rid of.
Signature · 1 line
2.43.0
Reviewed-by on v2 2/2
#6 lore raw

RE: [Intel-wired-lan] [PATCH iwl-net v2 2/2] iavf: fix QoS capabilities memory leak

Quoted 46 lines

-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of [email protected]
Sent: Wednesday, July 15, 2026 10:26 AM
To: Nguyen, Anthony L <[email protected]>; Kitszel, Przemyslaw <[email protected]>; Jagielski; Jagielski, Jedrzej <[email protected]>; intel-wired- [email protected]
Cc: Andrew Lunn <[email protected]>; Mitch Williams <[email protected]>; Greg Rose <[email protected]>; Sudheer Mogilappagari <[email protected]>; [email protected]; Xuanqiang Luo <[email protected]>; [email protected]
Subject: [Intel-wired-lan] [PATCH iwl-net v2 2/2] iavf: fix QoS capabilities memory leak

From: Xuanqiang Luo <[email protected]>

Commit 4c1a457cb8b0 ("iavf: add support to exchange qos capabilities") allocates adapter->qos_caps during probe, but iavf_remove() does not free it. This leaks the allocation whenever an iavf device is removed.

Free adapter->qos_caps in iavf_remove().

Fixes 4c1a457cb8b0 ("iavf: add support to exchange qos capabilities")
---
 drivers/net/ethernet/intel/iavf/iavf_main.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/iavf/iavf_main.c +1 -0
index 29b8403a066bc..c7f69a9040588 100644
@@ -5589,6 +5589,7 @@ static void iavf_remove(struct pci_dev *pdev)
 	iounmap(hw->hw_addr);
 	pci_release_regions(pdev);
 	kfree(adapter->vf_res);
+	kfree(adapter->qos_caps);
 	spin_lock_bh(&adapter->mac_vlan_list_lock);
 	/* If we got removed before an up/down sequence, we've got a
Quoted 4 lines

filter
* hanging out there that we need to get rid of.
--
2.43.0