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 0E65D30F7F3 for ; Mon, 4 May 2026 08:22: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=1777882960; cv=none; b=RV7M/ZFfzMcq+WwtHpDlShjwJarmWEu+fGj3wPJDVDYZN1/NYth2wY2WEwfWk4Fkcz8DF6tMVelnHsBCQuKES/ElPlG2anIR9n6bwisspALH6LI2ahVeLKNDVaKvPhGqrzNBMRW17LLvVV/6v2yofgxMVExdzbLM7e204vSRFoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777882960; c=relaxed/simple; bh=NvtpLt23Z7pAM43b8NZ9koyjI9toxGipyJVlcVTCrxQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OC/itr5HdIX0Hzpw5Qi0EX3sO8REyJt35QDf7kfuShnX3LU3zoikmFN0CVwlohiBrchDIbRrMJR/7yGCzOzijhoxy2GQGd5qfbBaJqi7Z7lQexIwYH3H+T33/P8ldvv9+upvYo67zvpV35+tmL/LPNsInMouNuNL0iOJ+0/42yw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fqTwyxA7; 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="fqTwyxA7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B070C2BCB8; Mon, 4 May 2026 08:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777882959; bh=NvtpLt23Z7pAM43b8NZ9koyjI9toxGipyJVlcVTCrxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fqTwyxA7l7voK3F4HnuGYymw4TbBQe9VszFLidqiPKhJNUqn5G5EjY4XUaQFj/DiP romuP5TIASo9bIxA4Fb/dxvdfHtJ6IOrcfdjW1QsyGgkYl6dZaTa6DnIiKeD/18z/H 1XWhJt8q3zpgHPRFQeuy/WxHRQBVe0UmNGS5zY47uc3iAxgrP/vUlMz7Z7XTX/GQxh RwX08hS5nzW1wxvWOoe0Z5i5Hcd9HPyEmjJwgj3nzbFMtsMhWq7AjhWnTZkg39ie0l PU6w8nMZlX8MVLpvqarTokB6EbhX4vVgkANlH+vZMr1pjCrvJOf2Jw+01j9LT8pk3S 59XXRbEzjQ8TQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Manivannan Sadhasivam , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y 1/2] net: qrtr: ns: Free the node during ctrl_cmd_bye() Date: Mon, 4 May 2026 04:22:32 -0400 Message-ID: <20260504082233.1875710-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050152-wok-satchel-2937@gregkh> References: <2026050152-wok-satchel-2937@gregkh> 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 Stable-dep-of: 27d5e84e810b ("net: qrtr: ns: Limit the total number of nodes") 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 654a3cc0d3479..7f7bd87cc6052 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -338,7 +338,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); @@ -353,8 +353,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); @@ -371,10 +373,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