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 560FA40DFD1 for ; Mon, 4 May 2026 04:11:17 +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=1777867877; cv=none; b=XgNH4MaCPcC+qatMM/ssBd0UwQUG5InueDCL8eglvBjVzaXBK0HpKAssGcjkEbghD74NvzDTfFj6/cpiAAfD8popP7VEt+P1d4gEBYloPobBKGs5nvZpbnjM7/F1Varvun+0p2UyWFyX7hPZkxvXsUDieDAAAHZpU2hSVy+MF64= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777867877; c=relaxed/simple; bh=+aezxZ/ZwPRWtaHTq63+Fdl4UB58kHnOqCKXu+FNA9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qauy3I5/S99Z0oDo0R8Dc1yhHoL7/slkd2ZlGg+ngmi8hGcMjqxlQ21qt9Oc/21o54qYDBwjWQ8f1JWe3gh72+JZIYijKlJwjCAH26UBThjoYjVgQgaRKce5cCaNtH7S4/nZS7ctzwIATIS6ea5w971XOc5cE2VSQb3ORBID1to= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FZJNNDWv; 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="FZJNNDWv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D75D4C2BCB8; Mon, 4 May 2026 04:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777867877; bh=+aezxZ/ZwPRWtaHTq63+Fdl4UB58kHnOqCKXu+FNA9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZJNNDWvYffGuUgY8hsY+Ggq2J80eykH7HVOumsNF/UlOtWXat+ammyVKMCVl+xBR yPbcSRYQ398evnWbI3W3hBj9XzmRz8MxndIwUingweGFYczdmGPcwoN5zgYqe5ApSR QU5ZKrOIwaoGrWiurq2xnd1Ed32hvWanQls2W70hYofD3c0k4mqq8OTawHowVm2u39 snAYfJCUa8ohMJ7YsaLseyoTEvhMU4SdlUjXqJiidewcPvVq7ypumxI0wiqZqnsMYt RFbdZTwhOIAYdwZPyWBkkmubqf0eYw8/K8Oeav34qe3VnqAjQSf02F6U47D8C6ZX1q 9bZwxPi72cSdg== From: Sasha Levin To: stable@vger.kernel.org Cc: Manivannan Sadhasivam , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y] net: qrtr: ns: Limit the maximum number of lookups Date: Mon, 4 May 2026 00:11:11 -0400 Message-ID: <20260504041111.1425615-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050118-film-barbecue-3f25@gregkh> References: <2026050118-film-barbecue-3f25@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 5640227d9a21c6a8be249a10677b832e7f40dc55 ] Current code does no bound checking on the number of lookups a client can perform. Though the code restricts the lookups to local clients, there is still a possibility of a malicious local client sending a flood of NEW_LOOKUP messages over the same socket. Fix this issue by limiting the maximum number of lookups to 64 globally. Since the nameserver allows only atmost one local observer, this global lookup count will ensure that the lookups stay within the limit. 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-2-00a8a5ff2b51@oss.qualcomm.com Signed-off-by: Jakub Kicinski [ adapted comment block to only mention QRTR_NS_MAX_LOOKUPS and kept kzalloc() instead of kzalloc_obj() due to missing prerequisite commits ] Signed-off-by: Sasha Levin --- net/qrtr/ns.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index 654a3cc0d3479..b1652317811a9 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -22,6 +22,7 @@ static struct { struct socket *sock; struct sockaddr_qrtr bcast_sq; struct list_head lookups; + u32 lookup_count; struct workqueue_struct *workqueue; struct work_struct work; int local_node; @@ -69,6 +70,11 @@ struct qrtr_node { struct xarray servers; }; +/* Max lookup 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_LOOKUPS 64 + static struct qrtr_node *node_get(unsigned int node_id) { struct qrtr_node *node; @@ -414,6 +420,7 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, list_del(&lookup->li); kfree(lookup); + qrtr_ns.lookup_count--; } /* Remove the server belonging to this port but don't broadcast @@ -531,6 +538,11 @@ static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from, if (from->sq_node != qrtr_ns.local_node) return -EINVAL; + if (qrtr_ns.lookup_count >= QRTR_NS_MAX_LOOKUPS) { + pr_err_ratelimited("QRTR client node exceeds max lookup limit!\n"); + return -ENOSPC; + } + lookup = kzalloc(sizeof(*lookup), GFP_KERNEL); if (!lookup) return -ENOMEM; @@ -539,6 +551,7 @@ static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from, lookup->service = service; lookup->instance = instance; list_add_tail(&lookup->li, &qrtr_ns.lookups); + qrtr_ns.lookup_count++; memset(&filter, 0, sizeof(filter)); filter.service = service; @@ -579,6 +592,7 @@ static void ctrl_cmd_del_lookup(struct sockaddr_qrtr *from, list_del(&lookup->li); kfree(lookup); + qrtr_ns.lookup_count--; } } -- 2.53.0