The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1f86253fabc8a2db79e8fe7c43602a4776c1a8b1

commit 1f86253fabc8a2db79e8fe7c43602a4776c1a8b1
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-07-03 15:08:31 +0000
Commit:     Kristof Provost <k...@freebsd.org>
CommitDate: 2025-07-09 08:57:50 +0000

    pf: assert that we call pf_addrcpy() with a valid address family
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/net/pfvar.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 0970f041cb1b..36fab1a03ee6 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -551,6 +551,9 @@ extern struct sx pf_end_lock;
 #endif /* PF_INET_INET6 */
 
 #ifdef _KERNEL
+
+void                            unhandled_af(int) __dead2;
+
 static void inline
 pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af)
 {
@@ -565,6 +568,8 @@ pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, 
sa_family_t af)
                memcpy(&dst->v6, &src->v6, sizeof(dst->v6));
                break;
 #endif /* INET6 */
+       default:
+               unhandled_af(af);
        }
 }
 #endif
@@ -2300,7 +2305,6 @@ VNET_DECLARE(struct pf_krule *, pf_rulemarker);
 #define V_pf_rulemarker     VNET(pf_rulemarker)
 #endif
 
-void                            unhandled_af(int) __dead2;
 int                             pf_start(void);
 int                             pf_stop(void);
 void                            pf_initialize(void);

Reply via email to