From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-21.smtp.spacemail.com (out-21.smtp.spacemail.com [66.29.159.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF139264617; Sun, 3 May 2026 08:40:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=66.29.159.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777797601; cv=none; b=VurgI/Zjpb/Xl+364n77zu6R4Rytp9anZzt05wdtV0apZMfqJfJTKuKhXkB+LI/+Gl47EZXvb0b3K7BnDgqsS14Uo5UVSLaJWQ2lB4oFCiUR3IfERztACgeCgr6p6jUEmXkKViW49O5SR3Uq3CcJ6/FJyafoi6pzCWvJpqfwkqs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777797601; c=relaxed/simple; bh=nR2UvrQhwXbHczxiyNhOgWKmudrRc0WInr0MsJ9wdoQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rDlZ9yffOo8GFQrpMdmQjbsmXvXxqffkRl26T6oWGbgoupoxVS7Y+7VeoQwKoRrQ+XIbnr84DZoyiGN0I4DW4C8xm620i5RTMVkhztJjTOQ71xpTRYWtBxfa/8wP0PO4Hn8I4HtGV1rf1Nic1mvp6Jhc08oVkU5QcdKqSvo1bVg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rexion.ai; spf=pass smtp.mailfrom=rexion.ai; dkim=fail (0-bit key) header.d=rexion.ai header.i=@rexion.ai header.b=GaqI1600 reason="key not found in DNS"; arc=none smtp.client-ip=66.29.159.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rexion.ai Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rexion.ai Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=rexion.ai header.i=@rexion.ai header.b="GaqI1600" Received: from Kyren (unknown [49.207.224.37]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.spacemail.com (Postfix) with ESMTPSA id 4g7dM16sHVz8sc7; Sun, 03 May 2026 08:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rexion.ai; s=spacemail; t=1777797169; bh=UWHDX60T6C3pWblSNBnfc+v9Si2dLL5tyuqjr8YWHtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GaqI1600Mw4HShgJETvm96UwJwiqOUcV1FSxhU8bHxLqdE14Vi1IjIHXfVUQjcw8P 5Sh1+RaUzR2GTSj3YbfFg6vPOtsAlG8ckMEDKOuxMn71xabRj1QwNFuOKKkKsiHrOC gYWy03DP8KdYtjz3quRMBxUlCQ5qpxmKCx70/7tQWVFxDbjani4HsTke0hbxPVQZ8y HUmrPCq3D9NIQFDoRzqaO1GHX16QucNbRNzFu6paCZUblrMxO5Z8H+TkgA13EA6vEE q1GCWUnZVmrLn3njPOTYixpsQr2TrGpYygBoGHXND5Qh++Pl1rbJ5NLBi+Rx3Ah5Qz +BXNw0nIJSnqw== From: HACKE-RC To: Pablo Neira Ayuso , Florian Westphal Cc: Phil Sutter , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, HACKE-RC Subject: [PATCH net-next v3 4/4] netfilter: nf_conntrack_sip: use nf_ct_helper_parse_port() Date: Sun, 3 May 2026 14:02:20 +0530 Message-ID: <20260503083220.630655-5-rc@rexion.ai> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260503083220.630655-1-rc@rexion.ai> References: <20260503083220.630655-1-rc@rexion.ai> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Envelope-From: rc@rexion.ai Replace simple_strtoul() based port parsing in ct_sip_parse_request() and ct_sip_parse_header_uri() with nf_ct_helper_parse_port(), which handles the bounded parse without requiring NUL-termination. The SIP-specific minimum port check (>= 1024) is retained as before. Signed-off-by: HACKE-RC --- net/netfilter/nf_conntrack_sip.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 182cfb119..ac29f0762 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -241,7 +241,7 @@ int ct_sip_parse_request(const struct nf_conn *ct, { const char *start = dptr, *limit = dptr + datalen, *end; unsigned int mlen; - unsigned int p; + u16 p; int shift = 0; /* Skip method and following whitespace */ @@ -269,8 +269,9 @@ int ct_sip_parse_request(const struct nf_conn *ct, return -1; if (end < limit && *end == ':') { end++; - p = simple_strtoul(end, (char **)&end, 10); - if (p < 1024 || p > 65535) + if (nf_ct_helper_parse_port(end, limit - end, &p, (char **)&end)) + return -1; + if (p < 1024) return -1; *port = htons(p); } else @@ -509,7 +510,7 @@ int ct_sip_parse_header_uri(const struct nf_conn *ct, const char *dptr, union nf_inet_addr *addr, __be16 *port) { const char *c, *limit = dptr + datalen; - unsigned int p; + u16 p; int ret; ret = ct_sip_walk_headers(ct, dptr, dataoff ? *dataoff : 0, datalen, @@ -522,8 +523,9 @@ int ct_sip_parse_header_uri(const struct nf_conn *ct, const char *dptr, return -1; if (*c == ':') { c++; - p = simple_strtoul(c, (char **)&c, 10); - if (p < 1024 || p > 65535) + if (nf_ct_helper_parse_port(c, limit - c, &p, (char **)&c)) + return -1; + if (p < 1024) return -1; *port = htons(p); } else -- 2.54.0