From: ZhaoJinming <zhaojinming@uniontech.com>
To: horms@kernel.org, madalin.bucur@nxp.com, sean.anderson@linux.dev
Cc: netdev@vger.kernel.org, andrew+netdev@lunn.ch,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, linux-kernel@vger.kernel.org,
ZhaoJinming <zhaojinming@uniontech.com>
Subject: [PATCH net v2 0/2] net: fman: fix IRQ-related bugs and add probe cleanup
Date: Tue, 21 Jul 2026 16:58:39 +0800 [thread overview]
Message-ID: <20260721085841.488088-1-zhaojinming@uniontech.com> (raw)
In-Reply-To: <20260709145221.1564906-3-horms@kernel.org>
Hi all,
This v2 series addresses the feedback from the previous irq_ready flag
approach (v1) and the separate UAF fix patch (v3). It replaces both
with a single root-cause fix: moving IRQ registration after driver
initialization is complete.
Issues fixed in this series:
1. Pre-init NULL dereference (crash on shared IRQ): is_init_done(NULL)
returns true, so the guard in fman_irq()/fman_err_irq() is bypassed
when fman->cfg is NULL before fman_config() allocates it. Moving
devm_request_irq() to after fman_init() eliminates this window.
2. Use-after-free on probe failure (UAF): kfree(fman) was called in
read_dts_node() error paths while devm IRQ handlers were still
registered. Moving IRQ registration later eliminates this window.
3. Interrupt storm risk on shared IRQ line: deferred enable() to after
IRQ registration, so the hardware is never active without a handler.
4. Memory leaks on probe failure: added fman_free_resources() and
fman_muram_finish() to properly release all sub-resources on
error paths after fman_config() succeeds.
5. Double-free in free_init_resources(): cleared fifo_offset and
cam_offset after each call in fman_init() error paths, and added
IS_ERR_VALUE() guards to prevent -ENOMEM from being treated as a
valid offset.
Pre-existing issues NOT addressed in this series
(suggested as follow-up patches):
- Missing .remove callback: the driver has no remove/unbind path,
causing all kzalloc'd resources to leak on device removal. This
is a larger issue affecting the entire driver lifecycle.
- Child device probe ordering: of_platform_populate() is called
before dev_set_drvdata(), so MAC drivers probing synchronously
will find no parent driver data. This is a pre-existing design
issue in the probe sequence.
- Hardware not disabled on cleanup: if enable() or devm_request_irq()
fails after fman_init() completes, the hardware remains active
while all software structures are freed. The driver lacks a
disable/stop function.
- fman_muram_alloc() failure stores -ENOMEM in fifo_offset: this is
a pre-existing issue that is now mitigated by the IS_ERR_VALUE()
guard in free_init_resources(), but the root cause (error code
stored in an unsigned long field) remains.
v2 changes:
- Move devm_request_irq() to fman_probe() after init (replaces
irq_ready + READ_ONCE approach from v1)
- Defer enable() to after IRQ registration to prevent interrupt storm
- Add proper error cleanup with fman_free_resources()
- Add fman_muram_finish() for complete MURAM teardown
- Clear fifo_offset/cam_offset after free_init_resources() to
prevent double-free
- Add IS_ERR_VALUE() guards in free_init_resources()
- Supersede the separate UAF fix patch (v3)
v1: https://lore.kernel.org/netdev/20260629084529.3709393-1-zhaojinming@uniontech.com/
Signed-off-by: ZhaoJinming <zhaojinming@uniontech.com>
next prev parent reply other threads:[~2026-07-21 9:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-03 7:43 [PATCH net v2 1/2] net: fman: move IRQ registration after init to prevent NULL deref and UAF ZhaoJinming
2026-07-03 7:43 ` [PATCH net v2 2/2] net: fman: add error cleanup path in fman_probe ZhaoJinming
2026-07-09 14:56 ` Simon Horman
2026-07-09 14:52 ` [PATCH net v2 1/2] net: fman: move IRQ registration after init to prevent NULL deref and UAF Simon Horman
2026-07-21 8:58 ` ZhaoJinming [this message]
2026-07-21 8:58 ` ZhaoJinming
2026-07-21 8:58 ` [PATCH net v2 2/2] net: fman: add error cleanup path in fman_probe ZhaoJinming
2026-07-23 17:26 ` [PATCH net v2 0/2] net: fman: fix IRQ-related bugs and add probe cleanup Jakub Kicinski
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=20260721085841.488088-1-zhaojinming@uniontech.com \
--to=zhaojinming@uniontech.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=madalin.bucur@nxp.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.anderson@linux.dev \
/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