Lib: Ensure that all net_addr structures have the same alignment

Also weaken the explicit alignment of net_addr to be u32, as VPN is already u32-aligned.
hack3ric · Dec 16, 2024 · 161aef3 · 161aef3
1 parent 34b7d77
commit 161aef3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/lib/birdlib.h b/lib/birdlib.h
@@ -11,6 +11,7 @@
 
 #include "lib/alloca.h"
 #include <stdarg.h>
+#include <stdalign.h>
 
 /* Ugly structure offset handling macros */
 

diff --git a/lib/net.c b/lib/net.c
@@ -75,6 +75,21 @@ STATIC_ASSERT(sizeof(net_addr_ip6_sadr)	== 40);
 STATIC_ASSERT(sizeof(net_addr_mpls)	==  8);
 STATIC_ASSERT(sizeof(net_addr_aspa)	==  8);
 
+/* Ensure that all net_addr structures have the same alignment */
+STATIC_ASSERT(alignof(net_addr_ip4)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_ip6)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_vpn4)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_vpn6)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_roa4)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_roa6)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_flow4)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_flow6)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_flow4)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_flow6)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_ip6_sadr) == alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_mpls)	== alignof(net_addr));
+STATIC_ASSERT(alignof(net_addr_aspa)	== alignof(net_addr));
+
 
 int
 rd_format(const vpn_rd rd_, char *buf, int buflen)

diff --git a/lib/net.h b/lib/net.h
@@ -51,7 +51,7 @@ typedef struct net_addr {
   u8 pxlen;
   u16 length;
   u8 data[20];
-  u64 align[0];
+  u32 align[0];
 } net_addr;
 
 typedef struct net_addr_ip4 {