* [PATCH net-next] mvpp2: fix pointer check
@ 2020-07-07 13:19 Matteo Croce
2020-07-07 20:03 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Matteo Croce @ 2020-07-07 13:19 UTC (permalink / raw)
To: netdev; +Cc: Sven Auhagen, linux-kernel, Colin Ian King, David S. Miller
From: Matteo Croce <mcroce@microsoft.com>
priv->page_pool is an array, so comparing against it will always return true.
Do a meaningful check by checking priv->page_pool[0] instead.
While at it, clear the page_pool pointers on deallocation, or when an
allocation error happens during init.
Reported-by: Colin Ian King <colin.king@canonical.com>
Fixes: c2d6fe6163de ("mvpp2: XDP TX support")
Signed-off-by: Matteo Croce <mcroce@microsoft.com>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index d8e238ed533e..6a3f356640a0 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -548,8 +548,10 @@ static int mvpp2_bm_pool_destroy(struct device *dev, struct mvpp2 *priv,
val |= MVPP2_BM_STOP_MASK;
mvpp2_write(priv, MVPP2_BM_POOL_CTRL_REG(bm_pool->id), val);
- if (priv->percpu_pools)
+ if (priv->percpu_pools) {
page_pool_destroy(priv->page_pool[bm_pool->id]);
+ priv->page_pool[bm_pool->id] = NULL;
+ }
dma_free_coherent(dev, bm_pool->size_bytes,
bm_pool->virt_addr,
@@ -609,8 +611,15 @@ static int mvpp2_bm_init(struct device *dev, struct mvpp2 *priv)
mvpp2_pools[pn].buf_num,
mvpp2_pools[pn].pkt_size,
dma_dir);
- if (IS_ERR(priv->page_pool[i]))
+ if (IS_ERR(priv->page_pool[i])) {
+ int j;
+
+ for (j = 0; j < i; j++) {
+ page_pool_destroy(priv->page_pool[j]);
+ priv->page_pool[j] = NULL;
+ }
return PTR_ERR(priv->page_pool[i]);
+ }
}
}
@@ -4486,7 +4495,7 @@ static int mvpp2_check_pagepool_dma(struct mvpp2_port *port)
if (!priv->percpu_pools)
return err;
- if (!priv->page_pool)
+ if (!priv->page_pool[0])
return -ENOMEM;
for (i = 0; i < priv->port_count; i++) {
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] mvpp2: fix pointer check
2020-07-07 13:19 [PATCH net-next] mvpp2: fix pointer check Matteo Croce
@ 2020-07-07 20:03 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-07-07 20:03 UTC (permalink / raw)
To: mcroce; +Cc: netdev, sven.auhagen, linux-kernel, colin.king
From: Matteo Croce <mcroce@linux.microsoft.com>
Date: Tue, 7 Jul 2020 15:19:13 +0200
> From: Matteo Croce <mcroce@microsoft.com>
>
> priv->page_pool is an array, so comparing against it will always return true.
> Do a meaningful check by checking priv->page_pool[0] instead.
> While at it, clear the page_pool pointers on deallocation, or when an
> allocation error happens during init.
>
> Reported-by: Colin Ian King <colin.king@canonical.com>
> Fixes: c2d6fe6163de ("mvpp2: XDP TX support")
> Signed-off-by: Matteo Croce <mcroce@microsoft.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-07 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-07 13:19 [PATCH net-next] mvpp2: fix pointer check Matteo Croce
2020-07-07 20:03 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).