diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-08-04 09:55:22 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-08-04 09:55:22 +0000 |
| commit | ddd850aa7720f77b6605599655df898b16ed74cc (patch) | |
| tree | 088b0a81aae5ddd57ed6e048e263304a852e56a5 /sys/net | |
| parent | 495826f69d96857bf0559516502e058ecab4ee4d (diff) | |
sys/socket.h: Fix AF_MAX
AF_MAX was always intended to be one more than the greatest allocated
value. Jeff broke this in 2013. Unfortunately, a bunch of people then
decided to adapt to the mistake instead of correcting it.
Fixes: 863c7e45628d (" - Reserve a special AF for SDP. The one we were incorrectly using before was taken by another AF.")
MFC after: 3 days
Sponsored by: Klara, Inc.
Sponsored by: NetApp, Inc.
Reviewed by: kevans, glebius
Differential Revision: https://reviews.freebsd.org/D58597
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/route/nhop_ctl.c | 2 | ||||
| -rw-r--r-- | sys/net/route/route_ddb.c | 2 | ||||
| -rw-r--r-- | sys/net/route/route_helpers.c | 4 | ||||
| -rw-r--r-- | sys/net/rtsock.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index f34721c888b4..59a81ecde4df 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -1339,7 +1339,7 @@ nhops_ifnet_state_changed(struct ifnet *ifp, bool status) struct nhop_iter iter = { .fibnum = ifp->if_fib, .wlock = true }; bool nhops_changed; - for (iter.family = 1; iter.family <= AF_MAX; iter.family++) { + for (iter.family = 1; iter.family < AF_MAX; iter.family++) { /* * By tracking nhop changes, we avoid redundant nhgrp * recompilation triggered by multiple events. diff --git a/sys/net/route/route_ddb.c b/sys/net/route/route_ddb.c index 71bffd98663b..c93370d0a570 100644 --- a/sys/net/route/route_ddb.c +++ b/sys/net/route/route_ddb.c @@ -174,7 +174,7 @@ DB_SHOW_COMMAND(routetable, db_show_routetable) i = lim = addr; else { i = 1; - lim = AF_MAX; + lim = AF_MAX - 1; } for (; i <= lim; i++) { diff --git a/sys/net/route/route_helpers.c b/sys/net/route/route_helpers.c index f09a8bbbd3e5..9160a5872534 100644 --- a/sys/net/route/route_helpers.c +++ b/sys/net/route/route_helpers.c @@ -183,7 +183,7 @@ rib_foreach_table_walk(int family, bool wlock, rib_walktree_f_t *wa_f, continue; } - for (int i = 1; i <= AF_MAX; i++) + for (int i = 1; i < AF_MAX; i++) rib_walk_ext(fibnum, i, wlock, wa_f, hook_f, arg); } } @@ -205,7 +205,7 @@ rib_foreach_table_walk_del(int family, rib_filter_f_t *filter_f, void *arg) continue; } - for (int i = 1; i <= AF_MAX; i++) + for (int i = 1; i < AF_MAX; i++) rib_walk_del(fibnum, i, filter_f, arg, 0); } } diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 47da83b5561b..fcccbc98470c 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -2623,7 +2623,7 @@ sysctl_rtsock(SYSCTL_HANDLER_ARGS) } else if (namelen != 3) return ((namelen < 3) ? EISDIR : ENOTDIR); af = name[0]; - if (af > AF_MAX) + if (af >= AF_MAX) return (EINVAL); bzero(&w, sizeof(w)); w.w_op = name[1]; @@ -2647,7 +2647,7 @@ sysctl_rtsock(SYSCTL_HANDLER_ARGS) case NET_RT_FLAGS: if (af == 0) { /* dump all tables */ i = 1; - lim = AF_MAX; + lim = AF_MAX - 1; } else /* dump only one table */ i = lim = af; |