From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6135940E149; Sat, 28 Feb 2026 17:44:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300682; cv=none; b=JCqIqqF9ivlETJvcMIEtairbXKKU4XsQrf+n8bQdM6eSUndnaTeD7rBEHPXI8VhJdqSMDfb5V5wt3CIDxLAjb9UMTyqq/q/U+bFzWiMDHdn1oChEB7XS899sfm8jD2Y+4LhDp4FyEEkabER+aTVrZdgNshP5uFYA0HauXm47s7I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300682; c=relaxed/simple; bh=kKnit95le2+dEaHuxkHCZ4Z5TC3ZZdIrDO+rIBCKDpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E9+l7e4k3yJLFC4HTfkzzoSMxDujAGBr93/Bqc9hxaWP8YsJRr32UcA/a9pcsy4ilkNvGE+MRlxPSzVaMJL27wI0mjMpKILcFxR7gfIrLtltWkL4HSufbaWlsdAks8Y5kG7rzuTFG3bKts1vBVVjXTYPzKaWLADXOXdwCVA5yv4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DrYmkDo9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DrYmkDo9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E665C2BC87; Sat, 28 Feb 2026 17:44:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300682; bh=kKnit95le2+dEaHuxkHCZ4Z5TC3ZZdIrDO+rIBCKDpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DrYmkDo924i0iuYEPGkomd2NX1oUyqVNeD3JlBan1jD/CJQO3kw2dctCLksHSybAY TV2PvOpMR+gCqAHgHnqlRByiFORnKLwlDMBCGARhEUdLWxoQp/YXAmoAT8h/+MM7eh JdkNJcg15pjxt33XmQi9ln/1dF6F4YT8ru0IAxsr83/Yydidr/3h0PLGEQeejWOkDo vTlGLnmgdQVYoKlBawgOzQOjuMYWjj8pA5nX6l7xME1k/OYvUOBo7mxsFYEtHFAGgQ oQNrpZAn4F5ErOmIpF5UUlH0kcGhGNonblZUxOQ5QH6eC34xuJs/aBp4z0Dk3bm74R dCc5EweWj/z+Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haoxiang Li , Andrew Morton , Alexandre Bounine , Matt Porter , Sasha Levin Subject: [PATCH 6.19 719/844] rapidio: replace rio_free_net() with kfree() in rio_scan_alloc_net() Date: Sat, 28 Feb 2026 12:30:32 -0500 Message-ID: <20260228173244.1509663-720-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Haoxiang Li [ Upstream commit 666183dcdd9ad3b8156a1df7f204f728f720380f ] 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 Reviewed-by: Andrew Morton Cc: Alexandre Bounine Cc: Matt Porter Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- drivers/rapidio/rio-scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index c12941f71e2cb..dcd6619a4b027 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c @@ -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; -- 2.51.0