aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Horatiu Vultur <horatiu.vultur@microchip.com> 2022-05-11 22:40:59 +0200
committerGravatar Jakub Kicinski <kuba@kernel.org> 2022-05-12 16:21:56 -0700
commitf0a65f815f640499990d446d4f5d9090634fdf27 (patch)
tree771336dd77f2b0cbe34b15b5b54ccce1c0ef2d5a
parentnet: update the register_netdevice() kdoc (diff)
downloadlinux-f0a65f815f640499990d446d4f5d9090634fdf27.tar.gz
linux-f0a65f815f640499990d446d4f5d9090634fdf27.tar.bz2
linux-f0a65f815f640499990d446d4f5d9090634fdf27.zip
net: lan966x: Fix use of pointer after being freed
The smatch found the following warning: drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c:736 lan966x_fdma_reload() warn: 'rx_dcbs' was already freed. This issue can happen when changing the MTU on one of the ports and once the RX buffers are allocated and then the TX buffer allocation fails. In that case the RX buffers should not be restore. This fix this issue such that the RX buffers will not be restored if the TX buffers failed to be allocated. Fixes: 2ea1cbac267e2a ("net: lan966x: Update FDMA to change MTU.") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> Link: https://lore.kernel.org/r/20220511204059.2689199-1-horatiu.vultur@microchip.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c
index 9e2a7323eaf0..6dea7f8c1481 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c
@@ -729,11 +729,11 @@ static int lan966x_fdma_reload(struct lan966x *lan966x, int new_mtu)
return err;
restore:
lan966x->rx.dma = rx_dma;
- lan966x->tx.dma = tx_dma;
+ lan966x->rx.dcbs = rx_dcbs;
lan966x_fdma_rx_start(&lan966x->rx);
restore_tx:
- lan966x->rx.dcbs = rx_dcbs;
+ lan966x->tx.dma = tx_dma;
lan966x->tx.dcbs = tx_dcbs;
lan966x->tx.dcbs_buf = tx_dcbs_buf;