On the first probe, ena_com_admin_init() allocates the completion
contexts and admin SQ/CQ buffers before setting admin_queue->ena_dev.
Their allocation failure paths log through this pointer, which is
still NULL. A failed allocation therefore dereferences NULL instead
of returning -ENOMEM.
Set admin_queue->ena_dev before the first allocation so the helpers
can log errors and return -ENOMEM normally.
Fixes: da580ca8de2c ("net: ena: add device distinct log prefix to files")
Signed-off-by: Avi Weiss <redacted>
---
drivers/net/ethernet/amazon/ena/ena_com.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c
index 297fb36ab8c16..23b3ef50b8b6b 100644
--- a/drivers/net/ethernet/amazon/ena/ena_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_com.c
@@ -2000,6 +2000,8 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
spin_lock_init(&admin_queue->q_lock);
+ admin_queue->ena_dev = ena_dev;
+
ret = ena_com_init_comp_ctxt(admin_queue);
if (ret)
goto error;
@@ -2045,7 +2047,6 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
if (ret)
goto error;
- admin_queue->ena_dev = ena_dev;
admin_queue->running_state = true;
return 0;
base-commit: fa5196392691051963726787944db872420dfa75
--
2.43.0