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 6BAF21A6830 for ; Mon, 4 May 2026 05:39:39 +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=1777873179; cv=none; b=RnDchTTOAYxj8y3QrgzqhDbPLHyc+jmQ+Iv63JAG548giKPA1uSbHiS1rC0rW9B50xXTwhnmr5VtRHhfvuL7oEYRXNsa0hj3w30ukVvDQicN6+uQqJPwt/mP4Dq0GJah2ewPq6WqxzfbVQZpPKnLBUl2qN99gxtoIza3V3I7aOs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777873179; c=relaxed/simple; bh=id9+iWMpaC3OfLB/KLTKRhoDnXIdrK9EvD7XA2qc4eg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DZtZ/CL6QmlTLE9OEiZ8qbgyEZ/tnyVXLiT4lx296K5+2c6iRue442k9UkawdKx2QRDIODhTbqEYk5WeGufxT0XiNGXxQzCi4XMqpBwWa1/aH6cJYeNNaahD56OTY8uDaNogPBj+31nBDx7I5EGvfRX7y5x12sGehmTyHYn9Zc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FsAXLlp7; 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="FsAXLlp7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECF59C2BCF4; Mon, 4 May 2026 05:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777873179; bh=id9+iWMpaC3OfLB/KLTKRhoDnXIdrK9EvD7XA2qc4eg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FsAXLlp7AXESa7y6Upm+uTV5pKk7YHttwFxBt2uCzEg0/LVwP7nFZOKDKVITPsBiq 5FoIqMpEa2pwTzXoxS0ojYMFf8sMRl1yeO/Tq5IqWZkoo3QULY6s0vsRcMdgIouHSW ndy/PfKuPnphWepI16Tqtki9A0hFTZNQg64dScu9ZzwCIUu8Gb3N3h4avVrTrPF6Br Zd6YJihkLagfsY8nxUSfK37xtY/hrTYKDIxpkwm5VMBGYsPQnFnrtM6MmbbZ/2Ave3 HIfwfO8XASNle1iMW+t7c/q6OANIOmINAB2Efvg9g0TqkpIO9+D8KrJfUAEcufozcy n2ZvlpLWrDnJA== From: Sasha Levin To: stable@vger.kernel.org Cc: Manivannan Sadhasivam , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15.y 2/2] net: qrtr: ns: Free the node during ctrl_cmd_bye() Date: Mon, 4 May 2026 01:39:32 -0400 Message-ID: <20260504053932.1748829-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260504053932.1748829-1-sashal@kernel.org> References: <2026050140-pedicure-recluse-8dc9@gregkh> <20260504053932.1748829-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Manivannan Sadhasivam [ Upstream commit 68efba36446a7774ea5b971257ade049272a07ac ] A node sends the BYE packet when it is about to go down. So the nameserver should advertise the removal of the node to all remote and local observers and free the node finally. But currently, the nameserver doesn't free the node memory even after processing the BYE packet. This causes the node memory to leak. Hence, remove the node from Xarray list and free the node memory during both success and failure case of ctrl_cmd_bye(). Cc: stable@vger.kernel.org Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace") Signed-off-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260409-qrtr-fix-v3-3-00a8a5ff2b51@oss.qualcomm.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/qrtr/ns.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index e3b16bd0d2081..17291fceb4aeb 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -337,7 +337,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) struct qrtr_node *node; unsigned long index; struct kvec iv; - int ret; + int ret = 0; iv.iov_base = &pkt; iv.iov_len = sizeof(pkt); @@ -352,8 +352,10 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) /* Advertise the removal of this client to all local servers */ local_node = node_get(qrtr_ns.local_node); - if (!local_node) - return 0; + if (!local_node) { + ret = 0; + goto delete_node; + } memset(&pkt, 0, sizeof(pkt)); pkt.cmd = cpu_to_le32(QRTR_TYPE_BYE); @@ -370,10 +372,18 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); if (ret < 0) { pr_err("failed to send bye cmd\n"); - return ret; + goto delete_node; } } - return 0; + + /* Ignore -ENODEV */ + ret = 0; + +delete_node: + xa_erase(&nodes, from->sq_node); + kfree(node); + + return ret; } static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, -- 2.53.0