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 2835DCA6F for ; Mon, 4 May 2026 04:11:20 +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=1777867881; cv=none; b=Q2gmdoC75PY51PlwSTQpaxugxWOsRLA69iYnSNgL8WESGHtf/DFNFCM9KvUFLRyefcJxUTBHrNqvAo/fMS09+7b1BhElEH0DMXOnSveXV0i8PXohDyQG/5guFcMg3wfAsMr59S4jtJqGl4rw5Ji20419s1ydkIh4919vQl7rABQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777867881; c=relaxed/simple; bh=gQ4zNok8QPUHos3CiNt+rpKdmym5vX5I0nC48fJVGb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hHZzQSEQf3AYBJgrbakDv15n/QUbcNXBDRVwqFVQkpz7Yq4Hk12CdxVLuzgGEN4plcPIsAHaUxM3nemJ8SXKszzaEKBfB3LrP18TSKZJzrbEwYfwnE+GSNlWsdH9/M9Wv08Scmb+NjTaJx56AhKMK8r7FxGmzvjGGVqLgMqaj50= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VGg6XNjj; 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="VGg6XNjj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DC7FC2BCF6; Mon, 4 May 2026 04:11:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777867880; bh=gQ4zNok8QPUHos3CiNt+rpKdmym5vX5I0nC48fJVGb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VGg6XNjjVehhVOZhPKHovNdAksfERpQTsKX+o8jQhfijZKyqHKdCnMKPShqs33m4B +3jG1hiG5I3oS67JLn5Ur+0qjq3J/CkGh6npmItfau0HHzY4Kl6sYsxBPTucj/0CqJ /RrMGpeHzP/f9G6eV++ZRA8Pp0frDf1KnfCgXT9/hBoGEy48M2hrDy8Osr71mcm+El Ie6Xqm24CV743RDcMspuZkFcPSGyN814qzekWCvEt0dJx+WRG/8QXsYjtBRPLZ8PzI XM8Ng00rm3AuHF6PwY8SZGfRQC4uuTsg/nRtswabkKv+kpBwCK030hqLYBFjbwmRh+ TgEqp8vz+fXYA== From: Sasha Levin To: stable@vger.kernel.org Cc: Manivannan Sadhasivam , Yiming Qian , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y] net: qrtr: ns: Limit the maximum server registration per node Date: Mon, 4 May 2026 00:11:15 -0400 Message-ID: <20260504041115.1425803-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050102-deeply-shush-8321@gregkh> References: <2026050102-deeply-shush-8321@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 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 --- net/qrtr/ns.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index 654a3cc0d3479..f6534840c4236 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -67,8 +67,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; @@ -226,6 +232,17 @@ static struct qrtr_server *server_add(unsigned int service, 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; @@ -235,10 +252,6 @@ static struct qrtr_server *server_add(unsigned int service, 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) { @@ -249,6 +262,8 @@ static struct qrtr_server *server_add(unsigned int service, } else { kfree(old); } + } else { + node->server_count++; } trace_qrtr_ns_server_add(srv->service, srv->instance, @@ -289,6 +304,7 @@ static int server_del(struct qrtr_node *node, unsigned int port, bool bcast) } kfree(srv); + node->server_count--; return 0; } @@ -667,7 +683,7 @@ static void qrtr_ns_worker(struct work_struct *work) } 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); } -- 2.53.0