| Message ID | 05282415-e7f4-42f3-99f8-32fde8f30936@moroto.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4dcd0e83ea1d1df9b2e0174a6d3e795b3477d64e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns() | expand |
On 23/04/2024 19:15, Dan Carpenter wrote: > The rx_chn->irq[] array is unsigned int but it should be signed for the > error handling to work. Also if k3_udma_glue_rx_get_irq() returns zero > then we should return -ENXIO instead of success. > > Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Roger Quadros <rogerq@kernel.org>
On 23/04/24 9:45 pm, Dan Carpenter wrote: > The rx_chn->irq[] array is unsigned int but it should be signed for the > error handling to work. Also if k3_udma_glue_rx_get_irq() returns zero > then we should return -ENXIO instead of success. > > Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: MD Danish Anwar <danishanwar@ti.com>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 23 Apr 2024 19:15:22 +0300 you wrote: > The rx_chn->irq[] array is unsigned int but it should be signed for the > error handling to work. Also if k3_udma_glue_rx_get_irq() returns zero > then we should return -ENXIO instead of success. > > Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > [...] Here is the summary with links: - [net] net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns() https://git.kernel.org/netdev/net/c/4dcd0e83ea1d You are awesome, thank you!
diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c index cf7b73f8f450..b69af69a1ccd 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c @@ -421,12 +421,14 @@ static int prueth_init_rx_chns(struct prueth_emac *emac, if (!i) fdqring_id = k3_udma_glue_rx_flow_get_fdq_id(rx_chn->rx_chn, i); - rx_chn->irq[i] = k3_udma_glue_rx_get_irq(rx_chn->rx_chn, i); - if (rx_chn->irq[i] <= 0) { - ret = rx_chn->irq[i]; + ret = k3_udma_glue_rx_get_irq(rx_chn->rx_chn, i); + if (ret <= 0) { + if (!ret) + ret = -ENXIO; netdev_err(ndev, "Failed to get rx dma irq"); goto fail; } + rx_chn->irq[i] = ret; } return 0;
The rx_chn->irq[] array is unsigned int but it should be signed for the error handling to work. Also if k3_udma_glue_rx_get_irq() returns zero then we should return -ENXIO instead of success. Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- I had previously fixed the issues with the tx_chns() version of this but I didn't realize there was an rx version. These functions got moved around in net-next so that's why I noticed this bug... Moving the code around makes applying this to net-next kind of pain. drivers/net/ethernet/ti/icssg/icssg_prueth.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)