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 028AE36309C; Mon, 4 May 2026 14:27:30 +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=1777904851; cv=none; b=RT8qucBTmwSWWWyA6pG4Gv/OPz9OVL/Ha38HqXYdDhCa7CtC16JOGv7I9gAMwnSKGJTDRjsIHdLXh8KMsWHykNh5PjXcRMt+WLInZ7GMPAOvyaUzKxgf6ZuiRlUsNjJypi2xqg48iXpdaTc6rrDMkqO3eH3RxckGTDC8Co/JIDk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904851; c=relaxed/simple; bh=3jxXWwdeSzyEPNxcC1aq1sH/IEnLYo+NqNtyeZxenYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iUfnom1JMhEY12q3Pi7MMz5MY5nA9c83L2TVbLY2Tj76f2A5SFjwTdw5W3BFG4J7LAOx3TbLBgxxk1CIoXljs19xfZecRwUllKtCQDnmrKq7C6OWb6MLmik5jvX5Q4cMyRluT+7ezaUdTRBXQBO9BeplFXkIji50ocevn9cuk9A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M3D7+HOt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="M3D7+HOt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B0C0C2BCB8; Mon, 4 May 2026 14:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777904850; bh=3jxXWwdeSzyEPNxcC1aq1sH/IEnLYo+NqNtyeZxenYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M3D7+HOtJA9L5v5xPNDl/cIYuNMJbs7LnRZtHBdS0Gl0sGFmC5DrgJ4WD/Pxg1OHd uCI2n4fjluWh/ckRiOot/yNDUPPEwDDszwNsUMVYz3XczDpvT8k82Czvj8sLJcf42Z KWkzAIFgm1KWo+9hXuljUa93PzsCZNcNeScOiqd8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yiming Qian , Simon Horman , Manivannan Sadhasivam , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 198/215] net: qrtr: ns: Limit the maximum server registration per node Date: Mon, 4 May 2026 15:53:37 +0200 Message-ID: <20260504135137.777287467@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135130.169210693@linuxfoundation.org> References: <20260504135130.169210693@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Manivannan Sadhasivam [ Upstream commit d5ee2ff98322337951c56398e79d51815acbf955 ] Current code does no bound checking on the number of servers added per node. A malicious client can flood NEW_SERVER messages and exhaust memory. Fix this issue by limiting the maximum number of server registrations to 256 per node. If the NEW_SERVER message is received for an old port, then don't restrict it as it will get replaced. While at it, also rate limit the error messages in the failure path of qrtr_ns_worker(). Note that the limit of 256 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") Reported-by: Yiming Qian Reviewed-by: Simon Horman Signed-off-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260409-qrtr-fix-v3-1-00a8a5ff2b51@oss.qualcomm.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/qrtr/ns.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -68,8 +68,14 @@ struct qrtr_server { struct qrtr_node { unsigned int id; struct xarray servers; + u32 server_count; }; +/* Max server limit is chosen based on the current platform requirements. If the + * requirement changes in the future, this value can be increased. + */ +#define QRTR_NS_MAX_SERVERS 256 + static struct qrtr_node *node_get(unsigned int node_id) { struct qrtr_node *node; @@ -230,6 +236,17 @@ static struct qrtr_server *server_add(un if (!service || !port) return NULL; + node = node_get(node_id); + if (!node) + return NULL; + + /* Make sure the new servers per port are capped at the maximum value */ + old = xa_load(&node->servers, port); + if (!old && node->server_count >= QRTR_NS_MAX_SERVERS) { + pr_err_ratelimited("QRTR client node %u exceeds max server limit!\n", node_id); + return NULL; + } + srv = kzalloc(sizeof(*srv), GFP_KERNEL); if (!srv) return NULL; @@ -239,10 +256,6 @@ static struct qrtr_server *server_add(un srv->node = node_id; srv->port = port; - node = node_get(node_id); - if (!node) - goto err; - /* Delete the old server on the same port */ old = xa_store(&node->servers, port, srv, GFP_KERNEL); if (old) { @@ -253,6 +266,8 @@ static struct qrtr_server *server_add(un } else { kfree(old); } + } else { + node->server_count++; } trace_qrtr_ns_server_add(srv->service, srv->instance, @@ -293,6 +308,7 @@ static int server_del(struct qrtr_node * } kfree(srv); + node->server_count--; return 0; } @@ -681,7 +697,7 @@ static void qrtr_ns_worker(struct work_s } if (ret < 0) - pr_err("failed while handling packet from %d:%d", + pr_err_ratelimited("failed while handling packet from %d:%d", sq.sq_node, sq.sq_port); }