From nobody Tue Jul 7 16:29:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gvmrq3v1dz6k5qg for ; Tue, 07 Jul 2026 16:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvmrq1f1Yz41Fb for ; Tue, 07 Jul 2026 16:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783441755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O505dgxPLinnL0BkdEJpSk6FVOx48NJ/izIkCH0xubc=; b=bEst3t7hqAMALbW3XjaopDeMemnzE7JLMysR8G8C6dhlECbCJfmDLDoZJZY3DhZ6vs0M7E FxjvEiMu8zIeF1E7p9Vsi7N8nC0s/LGBZMVO6lFtoEGaQ4BY6M4jivF9tIvFcu/f1LkSns ofTD/ifRjQp9HTeHRmw0Xx2IPCNI9CUUWZpyj04seG32vNM2YOz2gzqLSBjku0AHUmNYGb hBVOHKgVpVEREstTzXRst3CEaW+lmvR/BQh33q69bMhU9fV+bM6J0UMa3hGGs52Lgv/NQy NCM0kHzV01w6zBP9ARHmiHc4G0GpJtjtMDqmhsFzfMkvVB2fbhxVxUe4YKNeAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783441755; a=rsa-sha256; cv=none; b=B5D+kiNQV5oYOAO/osHetDZ8NPEONpiaEXn+2LXedNrrobz7PyFjeXryB1zT69q+R02Ztj GSCYHJ7jCiCTyiil2Hg2BRyiUeu6CSU+PB09PvuGP79a6GJ7152DrhRNjFoHVnIpFH51ho lTAVpT0C8DD8JAFsu/SU+/Xq4sEo9DVxy5UVH0IOGybkXASWxA932+w0c1vN61xS/S73dH hTLitxvNWePCHlBjzi7Enzt6uLvQzTMvbsxocWHS5JtezWpg1hNf5DJpj50dAUgZuLmV8Q 41rf6QR8WRcn+eu6kdERfkkp/FdtnDe/lzBToFOU05J4jBEGmOGjX3XkMxjSeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783441755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O505dgxPLinnL0BkdEJpSk6FVOx48NJ/izIkCH0xubc=; b=dkmtF1lRxY3UEoFYp6/rfzpJ7R9BosqSIBjcsZmZtiYtydJ/IJ55FkarslExZtmoJccUiO HemIH4tn7pmkUKs7sAU81HBEogV+XN9WtkhM3CNVxtuYVeoeSOfhz3GqIVlzWyFWiMuvTy AM0F6cQ6mrRuE1bRkfqsltFzxpXJZRuCnAE1YzPWNEKAgYcK7BJhfPTiX34k5lEiKD/fWA f5pw9I13q+ka2eC+VMF7zRAQYBA1fa7oARYET7DnA3XG7CFc1fV5bNWKVO77FiuPFvcd3S x1faLnUjjzemRbt0uPA9wFlfizB2HBX/VDWjVeMnjviab8D2eUZToMbJ5lIBfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvmrq05RYzjl9 for ; Tue, 07 Jul 2026 16:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2596e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 16:29:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1ea204b91909 - main - inpcb: make net.inet.ip.portrange port number limiting sysctls unsigned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ea204b91909fe6c2060b1fa522b31bb5b8c7dd1 Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 16:29:15 +0000 Message-Id: <6a4d295b.2596e.74d5a917@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1ea204b91909fe6c2060b1fa522b31bb5b8c7dd1 commit 1ea204b91909fe6c2060b1fa522b31bb5b8c7dd1 Author: Gleb Smirnoff AuthorDate: 2026-07-07 16:28:48 +0000 Commit: Gleb Smirnoff CommitDate: 2026-07-07 16:28:48 +0000 inpcb: make net.inet.ip.portrange port number limiting sysctls unsigned And make net.inet.ip.portrange.randomized boolean. Reviewed by: pouria, tuexen, markj Differential Revision: https://reviews.freebsd.org/D57291 --- sys/netinet/in_pcb.c | 48 ++++++++++++++++++++++++------------------------ sys/netinet/in_pcb.h | 18 +++++++++--------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 84b175b42eec..7a9e327893ca 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -115,23 +115,23 @@ * These configure the range of local port addresses assigned to * "unspecified" outgoing connections/packets/whatever. */ -VNET_DEFINE(int, ipport_lowfirstauto) = IPPORT_RESERVED - 1; /* 1023 */ -VNET_DEFINE(int, ipport_lowlastauto) = IPPORT_RESERVEDSTART; /* 600 */ -VNET_DEFINE(int, ipport_firstauto) = IPPORT_EPHEMERALFIRST; /* 10000 */ -VNET_DEFINE(int, ipport_lastauto) = IPPORT_EPHEMERALLAST; /* 65535 */ -VNET_DEFINE(int, ipport_hifirstauto) = IPPORT_HIFIRSTAUTO; /* 49152 */ -VNET_DEFINE(int, ipport_hilastauto) = IPPORT_HILASTAUTO; /* 65535 */ +VNET_DEFINE(u_int, ipport_lowfirstauto) = IPPORT_RESERVED - 1; /* 1023 */ +VNET_DEFINE(u_int, ipport_lowlastauto) = IPPORT_RESERVEDSTART; /* 600 */ +VNET_DEFINE(u_int, ipport_firstauto) = IPPORT_EPHEMERALFIRST; /* 10000 */ +VNET_DEFINE(u_int, ipport_lastauto) = IPPORT_EPHEMERALLAST; /* 65535 */ +VNET_DEFINE(u_int, ipport_hifirstauto) = IPPORT_HIFIRSTAUTO; /* 49152 */ +VNET_DEFINE(u_int, ipport_hilastauto) = IPPORT_HILASTAUTO; /* 65535 */ /* * Reserved ports accessible only to root. There are significant * security considerations that must be accounted for when changing these, * but the security benefits can be great. Please be careful. */ -VNET_DEFINE(int, ipport_reservedhigh) = IPPORT_RESERVED - 1; /* 1023 */ -VNET_DEFINE(int, ipport_reservedlow); +VNET_DEFINE(u_int, ipport_reservedhigh) = IPPORT_RESERVED - 1; /* 1023 */ +VNET_DEFINE(u_int, ipport_reservedlow); /* Enable random ephemeral port allocation by default. */ -VNET_DEFINE(int, ipport_randomized) = 1; +VNET_DEFINE(bool, ipport_randomized) = true; #ifdef INET static struct inpcb *in_pcblookup_internal(struct inpcbinfo *pcbinfo, @@ -166,35 +166,35 @@ static SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, "IP Ports"); SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &VNET_NAME(ipport_lowfirstauto), 0, &sysctl_net_ipport_check, "I", + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + &VNET_NAME(ipport_lowfirstauto), 0, &sysctl_net_ipport_check, "IU", ""); SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, lowlast, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &VNET_NAME(ipport_lowlastauto), 0, &sysctl_net_ipport_check, "I", + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + &VNET_NAME(ipport_lowlastauto), 0, &sysctl_net_ipport_check, "IU", ""); SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, first, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &VNET_NAME(ipport_firstauto), 0, &sysctl_net_ipport_check, "I", + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + &VNET_NAME(ipport_firstauto), 0, &sysctl_net_ipport_check, "IU", ""); SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, last, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &VNET_NAME(ipport_lastauto), 0, &sysctl_net_ipport_check, "I", + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + &VNET_NAME(ipport_lastauto), 0, &sysctl_net_ipport_check, "IU", ""); SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hifirst, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &VNET_NAME(ipport_hifirstauto), 0, &sysctl_net_ipport_check, "I", + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + &VNET_NAME(ipport_hifirstauto), 0, &sysctl_net_ipport_check, "IU", ""); SYSCTL_PROC(_net_inet_ip_portrange, OID_AUTO, hilast, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &VNET_NAME(ipport_hilastauto), 0, &sysctl_net_ipport_check, "I", + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + &VNET_NAME(ipport_hilastauto), 0, &sysctl_net_ipport_check, "IU", ""); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, reservedhigh, +SYSCTL_UINT(_net_inet_ip_portrange, OID_AUTO, reservedhigh, CTLFLAG_VNET | CTLFLAG_RW | CTLFLAG_SECURE, &VNET_NAME(ipport_reservedhigh), 0, ""); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, reservedlow, +SYSCTL_UINT(_net_inet_ip_portrange, OID_AUTO, reservedlow, CTLFLAG_RW|CTLFLAG_SECURE, &VNET_NAME(ipport_reservedlow), 0, ""); -SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomized, +SYSCTL_BOOL(_net_inet_ip_portrange, OID_AUTO, randomized, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ipport_randomized), 0, "Enable random port allocation"); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index ea93780730de..933a4c42808e 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -624,15 +624,15 @@ typedef enum { #define INP_CHECK_SOCKAF(so, af) (INP_SOCKAF(so) == af) -VNET_DECLARE(int, ipport_reservedhigh); -VNET_DECLARE(int, ipport_reservedlow); -VNET_DECLARE(int, ipport_lowfirstauto); -VNET_DECLARE(int, ipport_lowlastauto); -VNET_DECLARE(int, ipport_firstauto); -VNET_DECLARE(int, ipport_lastauto); -VNET_DECLARE(int, ipport_hifirstauto); -VNET_DECLARE(int, ipport_hilastauto); -VNET_DECLARE(int, ipport_randomized); +VNET_DECLARE(u_int, ipport_reservedhigh); +VNET_DECLARE(u_int, ipport_reservedlow); +VNET_DECLARE(u_int, ipport_lowfirstauto); +VNET_DECLARE(u_int, ipport_lowlastauto); +VNET_DECLARE(u_int, ipport_firstauto); +VNET_DECLARE(u_int, ipport_lastauto); +VNET_DECLARE(u_int, ipport_hifirstauto); +VNET_DECLARE(u_int, ipport_hilastauto); +VNET_DECLARE(bool, ipport_randomized); #define V_ipport_reservedhigh VNET(ipport_reservedhigh) #define V_ipport_reservedlow VNET(ipport_reservedlow)