* [PATCH] dpaa2 ethernet switch driver: Fix memory leak in dpaa2_switch_acl_entry_add()
@ 2022-03-01 9:34 Q1IQ
2022-03-01 12:14 ` Denis Kirjanov
0 siblings, 1 reply; 5+ messages in thread
From: Q1IQ @ 2022-03-01 9:34 UTC (permalink / raw)
To: ioana.ciornei, davem, kuba; +Cc: netdev, linux-kernel, lyz_cs, Q1IQ
[why]
The error handling branch did not properly free the memory of cmd_buf
before return, which would cause memory leak.
[how]
Fix this by adding kfree to the error handling branch.
Signed-off-by: Q1IQ <fufuyqqqqqq@gmail.com>
---
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
index cacd454ac696..4d07aee07f4c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
@@ -132,6 +132,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(dev, acl_entry_cfg->key_iova))) {
dev_err(dev, "DMA mapping failed\n");
+ kfree(cmd_buff);
return -EFAULT;
}
@@ -142,6 +143,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
DMA_TO_DEVICE);
if (err) {
dev_err(dev, "dpsw_acl_add_entry() failed %d\n", err);
+ kfree(cmd_buff);
return err;
}
--
2.30.1 (Apple Git-130)
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] dpaa2 ethernet switch driver: Fix memory leak in dpaa2_switch_acl_entry_add()
2022-03-01 9:34 [PATCH] dpaa2 ethernet switch driver: Fix memory leak in dpaa2_switch_acl_entry_add() Q1IQ
@ 2022-03-01 12:14 ` Denis Kirjanov
2022-03-01 14:15 ` [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add Yeqi Fu
0 siblings, 1 reply; 5+ messages in thread
From: Denis Kirjanov @ 2022-03-01 12:14 UTC (permalink / raw)
To: Q1IQ, ioana.ciornei, davem, kuba; +Cc: netdev, linux-kernel, lyz_cs
3/1/22 12:34, Q1IQ пишет:
> [why]
> The error handling branch did not properly free the memory of cmd_buf
> before return, which would cause memory leak.
>
> [how]
> Fix this by adding kfree to the error handling branch.
>
> Signed-off-by: Q1IQ <fufuyqqqqqq@gmail.com>
You should use your real name and please add Fixes tag
> ---
> drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
> index cacd454ac696..4d07aee07f4c 100644
> --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
> +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
> @@ -132,6 +132,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
> DMA_TO_DEVICE);
> if (unlikely(dma_mapping_error(dev, acl_entry_cfg->key_iova))) {
> dev_err(dev, "DMA mapping failed\n");
> + kfree(cmd_buff);
> return -EFAULT;
> }
>
> @@ -142,6 +143,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
> DMA_TO_DEVICE);
> if (err) {
> dev_err(dev, "dpsw_acl_add_entry() failed %d\n", err);
> + kfree(cmd_buff);
> return err;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add
2022-03-01 12:14 ` Denis Kirjanov
@ 2022-03-01 14:15 ` Yeqi Fu
2022-03-01 17:03 ` Ioana Ciornei
2022-03-02 1:41 ` Jakub Kicinski
0 siblings, 2 replies; 5+ messages in thread
From: Yeqi Fu @ 2022-03-01 14:15 UTC (permalink / raw)
To: ioana.ciornei, davem, kuba; +Cc: netdev, linux-kernel, Yeqi Fu, Yongzhi Liu
The error handling branch did not properly free the memory of cmd_buf
before return, which would cause memory leak. So fix this by adding
kfree to the error handling branch.
Fixes: 1110318d83e8 ("dpaa2-switch: add tc flower hardware offload on ingress traffic")
Signed-off-by: Yeqi Fu <fufuyqqqqqq@gmail.com>
Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
---
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
index cacd454ac696..4d07aee07f4c 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
@@ -132,6 +132,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(dev, acl_entry_cfg->key_iova))) {
dev_err(dev, "DMA mapping failed\n");
+ kfree(cmd_buff);
return -EFAULT;
}
@@ -142,6 +143,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
DMA_TO_DEVICE);
if (err) {
dev_err(dev, "dpsw_acl_add_entry() failed %d\n", err);
+ kfree(cmd_buff);
return err;
}
--
2.30.1 (Apple Git-130)
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add
2022-03-01 14:15 ` [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add Yeqi Fu
@ 2022-03-01 17:03 ` Ioana Ciornei
2022-03-02 1:41 ` Jakub Kicinski
1 sibling, 0 replies; 5+ messages in thread
From: Ioana Ciornei @ 2022-03-01 17:03 UTC (permalink / raw)
To: Yeqi Fu
Cc: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Yongzhi Liu
On Tue, Mar 01, 2022 at 10:15:44PM +0800, Yeqi Fu wrote:
> The error handling branch did not properly free the memory of cmd_buf
> before return, which would cause memory leak. So fix this by adding
> kfree to the error handling branch.
>
> Fixes: 1110318d83e8 ("dpaa2-switch: add tc flower hardware offload on ingress traffic")
> Signed-off-by: Yeqi Fu <fufuyqqqqqq@gmail.com>
> Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Just as a note, this should have been [PATCH v2] and not v1.
Ioana
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add
2022-03-01 14:15 ` [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add Yeqi Fu
2022-03-01 17:03 ` Ioana Ciornei
@ 2022-03-02 1:41 ` Jakub Kicinski
1 sibling, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2022-03-02 1:41 UTC (permalink / raw)
To: Yeqi Fu; +Cc: ioana.ciornei, davem, netdev, linux-kernel, Yongzhi Liu
On Tue, 1 Mar 2022 22:15:44 +0800 Yeqi Fu wrote:
> @@ -142,6 +143,7 @@ int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,
> DMA_TO_DEVICE);
> if (err) {
> dev_err(dev, "dpsw_acl_add_entry() failed %d\n", err);
> + kfree(cmd_buff);
> return err;
> }
With more context:
return -EFAULT;
}
err = dpsw_acl_add_entry(ethsw->mc_io, 0, ethsw->dpsw_handle,
filter_block->acl_id, acl_entry_cfg);
dma_unmap_single(dev, acl_entry_cfg->key_iova, sizeof(cmd_buff),
DMA_TO_DEVICE);
if (err) {
dev_err(dev, "dpsw_acl_add_entry() failed %d\n", err);
+ kfree(cmd_buff);
return err;
}
kfree(cmd_buff);
return 0;
}
Here we see unmap is "pulled up" above the error check, same thing can
be done with the kfree(). Otherwise it looks slightly weird - the
buffer unmap and kfree are conceptually part of releasing the buffer,
yet they are split across the paths.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-02 1:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-01 9:34 [PATCH] dpaa2 ethernet switch driver: Fix memory leak in dpaa2_switch_acl_entry_add() Q1IQ
2022-03-01 12:14 ` Denis Kirjanov
2022-03-01 14:15 ` [PATCH v1] dpaa2-switch: fix memory leak of dpaa2_switch_acl_entry_add Yeqi Fu
2022-03-01 17:03 ` Ioana Ciornei
2022-03-02 1:41 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox