From nobody Sun Aug 16 20:25:17 2026 X-Original-To: dev-commits-src-branches@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 4hNSBk2XBQz6pYsf for ; Sun, 16 Aug 2026 20:25:18 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hNSBk1gGHz3x0k for ; Sun, 16 Aug 2026 20:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786911918; 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=DYzh5INxFfTRzRVV0nGCDWqqHcdCp6dZ6gEi0zsOxkY=; b=C/20OwhRjRbBsDSjZNvvDTg8JfNkA57+mnuO5clxkOK8rcQelydtx9z/xIIDg3hZV1CqvS 7DnrzLN6OwS9S+gOAROVh4u/XeN96G7MSacp66j5UtjMkX9i7xYv4ZGYSd0QyWKvnqH81Q 132nbDc5Q+8izgO3RtxVr4gZlvdCPWx1Cpsu5QqDCY9REPoPjUju9eQNugMFbn1jsBxEvY GAM/omHI7+piUHhGk+ND+sZYaKIxDHw+dr1hiQ96WQ5m0b6mK0ZWqjeYuklBq0p2HlcpDC bAeamoYAF3qsHgR0ScqDel3wjwHbcRQQ9OOivrz0PuYQkqZ+Db8m5/sf2wDrtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786911918; a=rsa-sha256; cv=none; b=Bb70PSGwJs7j6BOqU4inSMkm6wFFIdJsJ1DEg/Eco0Y1zoWGmtrzofjSAgLmh0upkAtWmt Q6yQzhyJGXjlYBJeSr6WTCgEl02HsqbOSN1740/TYQD7lh4mR62qWwSbFKTmZbzJhkRbqF KbnbzGIyrndB1XuKTQ27/TTzaWPNMR2n+g3zc/uXxDRc+RIztoSv227CuDaymPKn/m1lQ6 4D3lHFzcOSgvGPZqFbQHhLXGN0YPixdb2JGI+ZhX14bqcugoBWEc8nW5SlM3ZQUlwVDEjG OYJEw/xvr7ZorqOjy1CoQz5KTYDvswQjf2bGDxktCWN7B+ngg96GTVlbbYklkg== 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=1786911918; 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=DYzh5INxFfTRzRVV0nGCDWqqHcdCp6dZ6gEi0zsOxkY=; b=szRZ3kFiDK9JYxV2oVkre+TCBz/FLn3/ufKjfbEiTGjjFvy+5ZWWeuVZc9sake/JQDlCVf wO5twVKWvq4uIWmvJ6zIlBp24vQmHE5RmxeFmb4PyWTayciDKCGoLfQR5lH9dt4UrszZBe EymMeijh0xa/Ltc+hRWAlEiazNLAgBSwQHNDM8/8v1opp5bAZkhfuVEBxJCsasNB6Ho8Ar 0jrt6s5Z+RZOAjbSGu/XtVOONXhZwwzpHe6AhDJBbCb0AOEP55NfvXLA+zb/e2UOBuc3xi VSQCEkhUs2nroFUG07nZqj3WqzUQJKJJN6gL7ZL6EMY8uQ+5pnZ8v3S3/Eapgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hNSBj749hzkR8 for ; Sun, 16 Aug 2026 20:25:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45ab3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 20:25:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fb81855f1981 - stable/15 - routing: Fix table sizes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fb81855f198198a9035bf68196dba5f67662d0ff Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 20:25:17 +0000 Message-Id: <6a821cad.45ab3.7ed5d6f4@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb81855f198198a9035bf68196dba5f67662d0ff commit fb81855f198198a9035bf68196dba5f67662d0ff Author: Dag-Erling Smørgrav AuthorDate: 2026-08-13 21:45:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-16 20:24:58 +0000 routing: Fix table sizes Tables that have one element per protocol or address family were previously sized by AF_MAX + 1 since AF_MAX was off by one. Now that AF_MAX has been corrected, we need to apply the opposite correction to these tables. Fixes: ddd850aa7720 ("sys/socket.h: Fix AF_MAX") MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: pouria, kevans, glebius Differential Revision: https://reviews.freebsd.org/D58826 (cherry picked from commit 6c41d928bcd763ec60d55bec2886c05b03cf9e6a) --- sys/net/route/route_tables.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index fdcb775ac4ce..66b3df23e944 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -204,7 +204,7 @@ static void populate_kernel_routes(struct rib_head **new_rt_tables, struct rib_head *rh) { for (int i = 0; i < V_rt_numfibs; i++) { - struct rib_head *rh_src = new_rt_tables[i * (AF_MAX + 1) + rh->rib_family]; + struct rib_head *rh_src = new_rt_tables[i * AF_MAX + rh->rib_family]; if ((rh_src != NULL) && (rh_src != rh)) rib_copy_kernel_routes(rh_src, rh); } @@ -228,7 +228,7 @@ grow_rtables(uint32_t num_tables) KASSERT(num_tables >= V_rt_numfibs, ("num_tables(%u) < rt_numfibs(%u)\n", num_tables, V_rt_numfibs)); - new_rt_tables = mallocarray(num_tables * (AF_MAX + 1), sizeof(void *), + new_rt_tables = mallocarray(num_tables * AF_MAX, sizeof(void *), M_RTABLE, M_WAITOK | M_ZERO); #ifdef FIB_ALGO @@ -237,12 +237,12 @@ grow_rtables(uint32_t num_tables) /* * Current rt_tables layout: - * fib0[af0, af1, af2, .., AF_MAX]fib1[af0, af1, af2, .., Af_MAX].. + * fib0[af0, af1, af2, .., AF_MAX-1]fib1[af0, af1, af2, .., AF_MAX-1].. * this allows to copy existing tables data by using memcpy() */ if (V_rt_tables != NULL) memcpy(new_rt_tables, V_rt_tables, - V_rt_numfibs * (AF_MAX + 1) * sizeof(void *)); + V_rt_numfibs * AF_MAX * sizeof(void *)); /* Populate the remainders */ SLIST_FOREACH(dom, &domains, dom_next) { @@ -250,7 +250,7 @@ grow_rtables(uint32_t num_tables) continue; family = dom->dom_family; for (int i = 0; i < num_tables; i++) { - prnh = &new_rt_tables[i * (AF_MAX + 1) + family]; + prnh = &new_rt_tables[i * AF_MAX + family]; if (*prnh != NULL) continue; rh = dom->dom_rtattach(i); @@ -374,13 +374,13 @@ rt_tables_get_rnh_ptr(uint32_t table, sa_family_t family) KASSERT(table < V_rt_numfibs, ("%s: table out of bounds (%d < %d)", __func__, table, V_rt_numfibs)); - KASSERT(family < (AF_MAX + 1), - ("%s: fam out of bounds (%d < %d)", __func__, family, AF_MAX + 1)); + KASSERT(family < AF_MAX, + ("%s: fam out of bounds (%d < %d)", __func__, family, AF_MAX)); /* rnh is [fib=0][af=0]. */ prnh = V_rt_tables; /* Get the offset to the requested table and fam. */ - prnh += table * (AF_MAX + 1) + family; + prnh += table * AF_MAX + family; return (*prnh); } @@ -397,7 +397,7 @@ rt_tables_get_rnh_safe(uint32_t table, sa_family_t family) { if (__predict_false(table >= V_rt_numfibs)) return (NULL); - if (__predict_false(family >= (AF_MAX + 1))) + if (__predict_false(family >= AF_MAX)) return (NULL); return (rt_tables_get_rnh_ptr(table, family)); }