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 170BF38C2B3 for ; Mon, 4 May 2026 09:59:05 +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=1777888745; cv=none; b=YIUNiFzoDHer6XhN/SERW9ltbcQ+ocwiviSj6ZwXrO+VQGbG+qYgpUiD2b95gYuplH+s8mriVOwgNMcdMMt61Dn2A6NLMML8UEFrwV5iBHGS7Q9zGGUIm0a6y9picAaCLplV+dJM8Ek73NqAfU67Pjn66nhDgLLpVQlfkNOfG1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777888745; c=relaxed/simple; bh=Jp2dRtSbJ6bggEeqzfFJcjmzx+vU6aa4ExgTZk+M29g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hZXM5z8zG85d/PWyUE5WoDE/rPfn84RbKSjlpJdeLeDYgRyZL3virjIKRra7KdCIcWHpQhyulsFPBPaXNKjEMzVNtwrWyThOzK3nGS1XZ4SCyOSPGE9ZjtbZUyJ9YjWKBsqEIB3JuOoZ8PjaATjvq/DMaeIQmhcTHLgVWZIu5J0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jcqWIfnx; 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="jcqWIfnx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF353C2BCB8; Mon, 4 May 2026 09:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777888745; bh=Jp2dRtSbJ6bggEeqzfFJcjmzx+vU6aa4ExgTZk+M29g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jcqWIfnx4vOYCv6zNdslo1kEAJ3hF6RQUhPX2gwh3jKMZ/lmJNqKJwMc7QGuzdGDq pcDigiDsTozSbfeajeJhV9oihRDngEQU1ZYNl8+7EHnV8V9SCNOKdfjX6c/BcQfiwP x23gV1gNMDXh0AP3HkbWyDj+9SWyk4SGdL0FyPBb9a7kNiQIHuMRbjaz1GjduqQDE5 MmVaenR8E3dSiehibZMoD9WlMhY3/StKFUoH0KXJxNBOdJB2KCJOQA3AbZCsnBCyyk 50FG5w/SMGltryUndpttcVGsXzPmsfeFYgPm68/qYyfd0JZoWW7U4qMCGllxryyW2F zhVPYpuekC6xA== From: Sasha Levin To: stable@vger.kernel.org Cc: Manivannan Sadhasivam , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] net: qrtr: ns: Limit the total number of nodes Date: Mon, 4 May 2026 05:59:01 -0400 Message-ID: <20260504095901.2009146-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050153-cash-flakily-0066@gregkh> References: <2026050153-cash-flakily-0066@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 27d5e84e810b0849d08b9aec68e48570461ce313 ] Currently, the nameserver doesn't limit the number of nodes it handles. This can be an attack vector if a malicious client starts registering random nodes, leading to memory exhaustion. Hence, limit the maximum number of nodes to 64. Note that, limit of 64 is chosen based on the current platform requirements. If requirement changes in the future, this limit can be increased. 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-4-00a8a5ff2b51@oss.qualcomm.com Signed-off-by: Jakub Kicinski [ dropped node_count-- hunk since ctrl_cmd_bye() has no delete_node ] Signed-off-by: Sasha Levin --- net/qrtr/ns.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index 3c513e7ca2d5c..03b5ae3100de7 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -68,6 +68,16 @@ struct qrtr_node { struct radix_tree_root servers; }; +/* Max nodes, server, lookup limits are chosen based on the current platform + * requirements. If the requirement changes in the future, these values can be + * increased. + */ +#define QRTR_NS_MAX_NODES 64 +#define QRTR_NS_MAX_SERVERS 256 +#define QRTR_NS_MAX_LOOKUPS 64 + +static u8 node_count; + static struct qrtr_node *node_get(unsigned int node_id) { struct qrtr_node *node; @@ -76,6 +86,11 @@ static struct qrtr_node *node_get(unsigned int node_id) if (node) return node; + if (node_count >= QRTR_NS_MAX_NODES) { + pr_err_ratelimited("QRTR clients exceed max node limit!\n"); + return NULL; + } + /* If node didn't exist, allocate and insert it to the tree */ node = kzalloc(sizeof(*node), GFP_KERNEL); if (!node) @@ -88,6 +103,8 @@ static struct qrtr_node *node_get(unsigned int node_id) return NULL; } + node_count++; + return node; } -- 2.53.0