Commit 666183dc authored Jan 21, 2026 by Haoxiang Li Committed by Andrew Morton Jan 31, 2026

rapidio: replace rio_free_net() with kfree() in rio_scan_alloc_net()

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: e6b585ca ("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>

parent 503efe85

drivers/rapidio/rio-scan.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -854,7 +854,8 @@ static struct rio_net rio_scan_alloc_net(struct rio_mport mport,

		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;