* [merged mm-nonmm-stable] rapidio-replace-rio_free_net-with-kfree-in-rio_scan_alloc_net-v2.patch removed from -mm tree
@ 2026-02-01 0:16 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2026-02-01 0:16 UTC (permalink / raw)
To: mm-commits, stable, mporter, alex.bou9, akpm, lihaoxiang, akpm
The quilt patch titled
Subject: rapidio: replace rio_free_net() with kfree() in rio_scan_alloc_net()
has been removed from the -mm tree. Its filename was
rapidio-replace-rio_free_net-with-kfree-in-rio_scan_alloc_net-v2.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Subject: rapidio: replace rio_free_net() with kfree() in rio_scan_alloc_net()
Date: Wed, 21 Jan 2026 09:35:08 +0800
When idtab allocation fails, net is not registered with rio_add_net() yet,
so kfree(net) is sufficient to release the memory. Set mport->net to NULL
to avoid dangling pointer.
Link: https://lkml.kernel.org/r/20260121013508.195836-1-lihaoxiang@isrc.iscas.ac.cn
Fixes: e6b585ca6e81 ("rapidio: move net allocation into core code")
Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/rapidio/rio-scan.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/rapidio/rio-scan.c~rapidio-replace-rio_free_net-with-kfree-in-rio_scan_alloc_net-v2
+++ a/drivers/rapidio/rio-scan.c
@@ -854,7 +854,8 @@ static struct rio_net *rio_scan_alloc_ne
if (idtab == NULL) {
pr_err("RIO: failed to allocate destID table\n");
- rio_free_net(net);
+ kfree(net);
+ mport->net = NULL;
net = NULL;
} else {
net->enum_data = idtab;
_
Patches currently in -mm which might be from lihaoxiang@isrc.iscas.ac.cn are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-02-01 0:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-01 0:16 [merged mm-nonmm-stable] rapidio-replace-rio_free_net-with-kfree-in-rio_scan_alloc_net-v2.patch removed from -mm tree Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox