net: mana: Return error code from mana_create_rxq()
PATCH v2 1/1 net: mana: Return error code from mana_create_rxq()
mana_create_rxq() returns a struct mana_rxq pointer and returns NULL on any failure. The caller, mana_add_rx_queues(), cannot tell what went wrong and hardcodes the error as -ENOMEM. As a result the actual failure reported by the lower layers (for example -EPROTO from a failed HW request) is masked and every RX queue creation failure looks like an out-of-memory error.
Return an ERR_PTR() encoded error code from mana_create_rxq() on failure instead of NULL. The caller now propagates the returned error code directly instead of substituting -ENOMEM.
---
Changes in v2:
- Use ERR_PTR() to return the error from mana_create_rxq() instead of adding an output parameter, keeping the pointer return type.
v1: https://lore.kernel.org/all/[email protected]/
drivers/net/ethernet/microsoft/mana/mana_en.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/microsoft/mana/mana_en.c +4 -4
@@ -2829,7 +2829,7 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc, rxq =kvzalloc_flex (*rxq, rx_oobs, apc->rx_queue_size);if (!rxq) -return NULL ; +return ERR_PTR (-ENOMEM ); rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size;
@@ -2930,7 +2930,7 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,mana_destroy_rxq (apc, rxq, false); -return NULL ; +return ERR_PTR (err); }static void mana_create_rxq_debugfs (struct mana_port_context *apc,int idx)
@@ -2964,8 +2964,8 @@ static int mana_add_rx_queues(struct mana_port_context *apc,for (i =0 ; i < apc->num_queues; i++) { rxq =mana_create_rxq (apc, i, &apc->eqs[i], ndev); -if (!rxq) { - err = -ENOMEM ; +if (IS_ERR (rxq)) { + err =PTR_ERR (rxq);netdev_err (ndev,"Failed to create rxq %d : %d\n" , i, err); goto out; }
Signature · 1 line
2.43.0
Quoted 18 lines · Aditya Garg
mana_create_rxq()returns a structmana_rxqpointer and returns NULL on any failure. The caller,mana_add_rx_queues(), cannot tell what went wrong and hardcodes the error as-ENOMEM. As a result the actual failure reported by the lower layers (for example-EPROTOfrom a failed HW request) is masked and every RX queue creation failure looks like an out-of-memory error.Return an
ERR_PTR()encoded error code frommana_create_rxq()on failure instead of NULL. The caller now propagates the returned error code directly instead of substituting-ENOMEM.Fixes ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)")Signed-off-by Aditya Garg <[email protected]>---
Changes in v2:
- UseERR_PTR()to return the error frommana_create_rxq()instead of adding an output parameter, keeping the pointer return type.
Quoted 5 lines
v1: https://lore.kernel.org/all/[email protected]/
drivers/net/ethernet/microsoft/mana/mana_en.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] TOCTOU race and Use-After-Free in mana_get_stats64() and mana_xdp_xmit() due to lockless access of queues. --
--- Patch [1]: [PATCH net v2] net: mana: Return error code from mana_create_rxq() --- commit 61de155c59ba6f86af33fcadf7943152726f385f
Author: Aditya Garg <[email protected]>
net: mana: Return error code from mana_create_rxq()
mana_create_rxq() returns a struct mana_rxq pointer and returns NULL on any failure. The caller, mana_add_rx_queues(), cannot tell what went wrong and hardcodes the error as -ENOMEM. As a result the actual failure reported by the lower layers is masked.
Quoted 4 lines
drivers/net/ethernet/microsoft/mana/mana_en.c +0
-0
[ ... ]
drivers/net/ethernet/microsoft/mana/mana_en.c static int mana_add_rx_queues(struct mana_port_context *apc, · line 2971
Quoted 11 lines
drivers/net/ethernet/microsoft/mana/mana_en.c +2
-2@@ -2964,8 +2964,8 @@ static int mana_add_rx_queues(struct mana_port_context *apc,for (i =0 ; i < apc->num_queues; i++) { rxq =mana_create_rxq (apc, i, &apc->eqs[i], ndev); -if (!rxq) { - err = -ENOMEM ; +if (IS_ERR (rxq)) { + err =PTR_ERR (rxq);netdev_err (ndev,"Failed to create rxq %d : %d\n" , i, err); goto out; }
[Severity: High]
This is a pre-existing issue, but is there a TOCTOU race and Use-After-Free in mana_get_stats64() and mana_xdp_xmit() due to lockless access of queues?
If an administrator changes the MTU or closes the interface, mana_detach() is triggered. It locklessly clears apc->port_is_up, disables TX, and then frees the RX and TX queues using kvfree() directly via mana_dealloc_queues(), without an RCU grace period:
mana_detach()
apc->port_is_up = false;
/* Ensure port state updated before txq state */
smp_wmb();
netif_tx_disable(ndev);
if (apc->port_st_save) {
err = mana_dealloc_queues(ndev);Concurrently, can unprivileged userspace reading /proc/net/dev (triggering mana_get_stats64()) check apc->port_is_up, evaluate it as true, and then access the freed queues?
mana_get_stats64()
if (!apc->port_is_up)
return;
...
for (q = 0; q < num_queues; q++) {
rx_stats = &apc->rxqs[q]->stats;Similarly, in mana_xdp_xmit(), the TX lock is temporarily acquired and dropped for each packet in the loop, allowing mana_detach() to complete netif_tx_disable() and proceed with freeing the queue before mana_xdp_xmit() updates the stats:
mana_xdp_xmit()
for (i = 0; i < n; i++) {
if (mana_xdp_xmit_fm(ndev, frames[i], q_idx))
break;
count++;
}
tx_stats = &apc->tx_qp[q_idx]->txq.stats;
u64_stats_update_begin(&tx_stats->syncp);Can this lead to a Use-After-Free where memory corruption or a kernel panic occurs?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Mon, 27 Jul 2026 04:37:59 -0700 you wrote:
mana_create_rxq()returns a structmana_rxqpointer and returns NULL on any failure. The caller,mana_add_rx_queues(), cannot tell what went wrong and hardcodes the error as-ENOMEM. As a result the actual failure reported by the lower layers (for example-EPROTOfrom a failed HW request) is masked and every RX queue creation failure looks like an out-of-memory error.[...]
Here is the summary with links:
- [net,v2] net: mana: Return error code from mana_create_rxq()
https://git.kernel.org/netdev/net/c/e67cc80b50f5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html