From: Avi Weiss <thnkslprpt@gmail.com>
To: netdev@vger.kernel.org
Cc: akiyano@amazon.com, darinzon@amazon.com, andrew+netdev@lunn.ch,
davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org,
pabeni@redhat.com, Avi Weiss <thnkslprpt@gmail.com>
Subject: [PATCH net-next] net: ena: set admin device pointer before queue allocations
Date: Mon, 9 Nov 2026 09:11:27 +0200 [thread overview]
Message-ID: <20261109071126.87125-2-thnkslprpt@gmail.com> (raw)
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 <thnkslprpt@gmail.com>
---
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
next reply other threads:[~2026-11-09 7:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-09 7:11 Avi Weiss [this message]
2026-11-09 7:17 ` [PATCH net-next] net: ena: set admin device pointer before queue allocations netdev-bot+sinfo
2026-11-10 18:42 ` Arthur Kiyanovski
2026-11-11 22:20 ` Arthur Kiyanovski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261109071126.87125-2-thnkslprpt@gmail.com \
--to=thnkslprpt@gmail.com \
--cc=akiyano@amazon.com \
--cc=andrew+netdev@lunn.ch \
--cc=darinzon@amazon.com \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox