proxyarp: Fix DHCP and ND message structures

These need to be marked packed to avoid issues with compilers
potentially adding padding between the fields (e.g., gcc on 64-bit
seemed to make struct icmpv6_ndmsg two octets too long which broke IPv6
address discovery).

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/ap/dhcp_snoop.c b/src/ap/dhcp_snoop.c
index 703a59960a875a4f7ccae23a7a49f24f911c0414..c5e37fb4fb0ff830b7860e85757d9cf0a496f8d2 100644 (file)
--- a/src/ap/dhcp_snoop.c
+++ b/src/ap/dhcp_snoop.c
@@ -36,7 +36,7 @@ struct bootp_pkt {
        u8 serv_name[64];
        u8 boot_file[128];
        u8 exten[312];
-};
+} STRUCT_PACKED;
 
 #define DHCPACK        5
 static const u8 ic_bootp_cookie[] = { 99, 130, 83, 99 };

diff --git a/src/ap/ndisc_snoop.c b/src/ap/ndisc_snoop.c
index b29cc70ed4e4288a65f886e1f7a6e350cffd4493..755621c565c044053240212c01cc3bc45ab3354e 100644 (file)
--- a/src/ap/ndisc_snoop.c
+++ b/src/ap/ndisc_snoop.c
@@ -30,7 +30,7 @@ struct icmpv6_ndmsg {
        u8 opt_type;
        u8 len;
        u8 opt_lladdr[0];
-};
+} STRUCT_PACKED;
 
 #define ROUTER_ADVERTISEMENT   134
 #define NEIGHBOR_SOLICITATION  135