batman-adv: enforce u16 MAC address alignment
Sven Eckelmann
maintainercover batman-adv: enforce u16 MAC address alignment
Sashiko reported problems with mac addresses on the stack as part of
https://sashiko.dev/#/patchset/20260821094813.201800-1-sw%40simonwunderlich.de?part=5
Quoted 1 line
The mac array is allocated on the stack with 1-byte alignment by default.
[...]
Quoted 3 lines
Because
ether_addr_copy()casts the pointers to u16 to perform 16-bit operations on these architectures, it strictly requires both the source and destination pointers to be 2-byte aligned.
Annote MAC address ETH_ALEN arrays to avoid this problem in the most common cases.
---
Sven Eckelmann (2):
batman-adv: ensure u16 aligned mac address arrays on stack
batman-adv: ensure u16 aligned mac address in structs
net/batman-adv/bridge_loop_avoidance.c | 6 ++++-- net/batman-adv/distributed-arp-table.c | 8 ++++---- net/batman-adv/mesh-interface.c | 12 ++++++++---- net/batman-adv/multicast.c | 6 +++--- net/batman-adv/types.h | 26 +++++++++++++------------- 5 files changed, 32 insertions(+), 26 deletions(-)
---
base-commit: f3c33e7fcb7e88cc099b783faf26f0494b774571
change-id: 20260822-mac-u16-alignment-d25da5f6e8cc
Best regards,
Signature · 1 line
Sven Eckelmann <[email protected]>
Sven Eckelmann
maintainerPATCH 1/2 batman-adv: ensure u16 aligned mac address arrays on stack
An u8 array on the stack has a natural alignment of only 1 byte. An u8[ETH_ALEN] array on the stack must therefore be assumed to only be 1 byte aligned. But many etherdevices.h functions are requiring a 2 byte (u16) alignment.
Annote all u8[ETH_ALEN] arrays on the stack as __aligned(2) to make sure that the compiler takes care of aligning it correctly.
--- net/batman-adv/bridge_loop_avoidance.c | 6 ++++-- net/batman-adv/distributed-arp-table.c | 8 ++++---- net/batman-adv/mesh-interface.c | 12 ++++++++---- net/batman-adv/multicast.c | 6 +++--- 4 files changed, 19 insertions(+), 13 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +4 -2
@@ -663,7 +663,7 @@ static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw)static void batadv_bla_send_announce (struct batadv_priv *bat_priv,struct batadv_bla_backbone_gw *backbone_gw) { -u8 mac[ETH_ALEN ]; +u8 mac[ETH_ALEN ]__aligned(2) ;__be16 crc;memcpy (mac, batadv_announce_mac,4 );
@@ -1582,7 +1582,9 @@ static struct lock_class_key batadv_backbone_hash_lock_class_key;*/ int batadv_bla_init (struct batadv_priv *bat_priv) { -u8 claim_dest[ETH_ALEN ] = {0xff ,0x43 ,0x05 ,0x00 ,0x00 ,0x00 }; +static const u8 claim_dest[ETH_ALEN ]__aligned(2) = { +0xff ,0x43 ,0x05 ,0x00 ,0x00 ,0x00 + };struct batadv_hard_iface *primary_if;unsigned long entrytime;u16 crc;
net/batman-adv/distributed-arp-table.c +4 -4
@@ -940,7 +940,7 @@ batadv_dat_cache_dump_entry(struct sk_buff *msg, u32 portid,struct netlink_callback *cb, struct batadv_dat_entry *dat_entry) { - u8 mac[ETH_ALEN]; + u8 mac[ETH_ALEN] __aligned(2);u64 u64_mac;int msecs;void *hdr;
@@ -1236,10 +1236,10 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, {struct net_device *mesh_iface = bat_priv->mesh_iface;struct batadv_dat_entry *dat_entry =NULL ; +u8 mac[ETH_ALEN ]__aligned(2) ;struct sk_buff *skb_new;unsigned short vid;bool ret = false; -u8 mac[ETH_ALEN ];int hdr_size =0 ;__be32 ip_dst;__be32 ip_src;
@@ -1344,10 +1344,10 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) {struct batadv_dat_entry *dat_entry =NULL ; +u8 mac[ETH_ALEN ]__aligned(2) ;struct sk_buff *skb_new;unsigned short vid;bool ret = false; -u8 mac[ETH_ALEN ];__be32 ip_src;__be32 ip_dst;u64 u64_mac;
@@ -1474,9 +1474,9 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) {struct batadv_dat_entry *dat_entry =NULL ; +u8 mac[ETH_ALEN ]__aligned(2) ;bool dropped = false;unsigned short vid; -u8 mac[ETH_ALEN ];__be32 ip_src;__be32 ip_dst;u64 u64_mac;
net/batman-adv/mesh-interface.c +8 -4
@@ -141,9 +141,9 @@ static struct net_device_stats *batadv_interface_stats(struct net_device *dev)static int batadv_interface_set_mac_addr (struct net_device *dev,void *p) {struct batadv_priv *bat_priv =netdev_priv (dev); +u8 old_addr[ETH_ALEN ]__aligned(2) ;struct batadv_meshif_vlan *vlan;struct sockaddr *addr = p; -u8 old_addr[ETH_ALEN ];if (!is_valid_ether_addr (addr->sa_data))return -EADDRNOTAVAIL ;
@@ -213,13 +213,18 @@ static void batadv_interface_set_rx_mode(struct net_device *dev)static netdev_tx_t batadv_interface_tx (struct sk_buff *skb,struct net_device *mesh_iface) { -static const u8 ectp_addr[ETH_ALEN ] = {0xCF ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; -static const u8 stp_addr[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 ,0x00 ,0x00 };struct batadv_priv *bat_priv =netdev_priv (mesh_iface);enum batadv_dhcp_recipient dhcp_rcp =BATADV_DHCP_NO ;enum batadv_forw_mode forw_mode =BATADV_FORW_BCAST ; +static const u8 ectp_addr[ETH_ALEN ]__aligned(2) = { +0xCF ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 + }; +static const u8 stp_addr[ETH_ALEN ]__aligned(2) = { +0x01 ,0x80 ,0xC2 ,0x00 ,0x00 ,0x00 + };struct batadv_hard_iface *primary_if =NULL ;struct batadv_bcast_packet *bcast_packet; +u8 chaddr[ETH_ALEN ]__aligned(2) ;int network_offset =ETH_HLEN ;unsigned int header_len =0 ;unsigned long brd_delay =0 ;
@@ -229,7 +234,6 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,struct ethhdr *ethhdr;bool do_bcast = false;u8 *dst_hint =NULL ; -u8 chaddr[ETH_ALEN ];unsigned short vid;bool client_added;__be16 proto;
net/batman-adv/multicast.c +3 -3
@@ -374,9 +374,9 @@ batadv_mcast_mla_meshif_get_ipv4(struct net_device *dev,struct hlist_head *mcast_list, struct batadv_mcast_mla_flags *flags) { + u8 mcast_addr[ETH_ALEN] __aligned(2);struct batadv_hw_addr *new;struct in_device *in_dev; -u8 mcast_addr[ETH_ALEN ];struct ip_mc_list *pmc;int ret =0 ;
@@ -441,9 +441,9 @@ batadv_mcast_mla_meshif_get_ipv6(struct net_device *dev,struct hlist_head *mcast_list, struct batadv_mcast_mla_flags *flags) { + u8 mcast_addr[ETH_ALEN] __aligned(2);struct batadv_hw_addr *new;struct inet6_dev *in6_dev; -u8 mcast_addr[ETH_ALEN ];struct ifmcaddr6 *pmc6;int ret =0 ;
@@ -593,10 +593,10 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, struct batadv_mcast_mla_flags *flags) {struct list_head bridge_mcast_list =LIST_HEAD_INIT (bridge_mcast_list); +u8 mcast_addr[ETH_ALEN ]__aligned(2) ;u8 tvlv_flags = flags->tvlv_flags;struct br_ip_list *br_ip_entry;struct batadv_hw_addr *new; -u8 mcast_addr[ETH_ALEN ];struct br_ip_list *tmp;int ret;
Signature · 1 line
2.47.3
Sven Eckelmann
maintainerPATCH 2/2 batman-adv: ensure u16 aligned mac address in structs
In reply to Sven EckelmannAn u8 array in structures have a natural alignment of only 1 byte. An u8[ETH_ALEN] array must therefore be assumed to only be 1 byte aligned. But many etherdevices.h functions are requiring a 2 byte (u16) alignment.
All these addresses were either on the start of a struct or after a struct member which required at least an alignment of 2 byte. Still, annote all u8[ETH_ALEN] arrays on the stack as __aligned(2) to make sure that this assumption isn't broken by other modifications inside the structs.
--- net/batman-adv/types.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
net/batman-adv/types.h +13 -13
@@ -410,7 +410,7 @@ struct batadv_orig_bat_iv {*/ struct batadv_orig_node {/** @orig: originator ethernet address */ -u8 orig[ETH_ALEN ]; +u8 orig[ETH_ALEN ]__aligned(2) ;/** @ifinfo_list: list for routers per outgoing interface */ struct hlist_head ifinfo_list;
@@ -634,12 +634,12 @@ struct batadv_hardif_neigh_node {struct hlist_node list;/** @addr: the MAC address of the neighboring interface */ -u8 addr[ETH_ALEN ]; +u8 addr[ETH_ALEN ]__aligned(2) ;/** * @orig: the address of the originator this neighbor node belongs to */ -u8 orig[ETH_ALEN ]; +u8 orig[ETH_ALEN ]__aligned(2) ;/** @if_incoming: pointer to incoming hard-interface */ struct batadv_hard_iface *if_incoming;
@@ -677,7 +677,7 @@ struct batadv_neigh_node {#endif /** @addr: the MAC address of the neighboring interface */ -u8 addr[ETH_ALEN ]; +u8 addr[ETH_ALEN ]__aligned(2) ;/** @ifinfo_list: list for routing metrics per outgoing interface */ struct hlist_head ifinfo_list;
@@ -777,7 +777,7 @@ struct batadv_neigh_ifinfo {*/ struct batadv_bcast_duplist_entry {/** @orig: mac address of orig node originating the broadcast */ -u8 orig[ETH_ALEN ]; +u8 orig[ETH_ALEN ]__aligned(2) ;/** @crc: crc32 checksum of broadcast payload */ u32 crc;
@@ -1085,7 +1085,7 @@ struct batadv_priv_bla {struct batadv_hashtable *backbone_hash;/** @loopdetect_addr: MAC address used for own loopdetection frames */ -u8 loopdetect_addr[ETH_ALEN ]; +u8 loopdetect_addr[ETH_ALEN ]__aligned(2) ;/** * @loopdetect_lasttime: time when the loopdetection frames were sent
@@ -1352,7 +1352,7 @@ struct batadv_tp_vars_common {struct batadv_priv *bat_priv;/** @other_end: mac address of remote */ -u8 other_end[ETH_ALEN ]; +u8 other_end[ETH_ALEN ]__aligned(2) ;/** @session: TP session identifier */ u8 session[2 ];
@@ -1765,7 +1765,7 @@ struct batadv_bla_backbone_gw {* @orig: originator address of backbone node (mac address of primary * iface) */ -u8 orig[ETH_ALEN ]; +u8 orig[ETH_ALEN ]__aligned(2) ;/** @vid: vlan id this gateway was detected on */ unsigned short vid;
@@ -1810,7 +1810,7 @@ struct batadv_bla_backbone_gw {*/ struct batadv_bla_claim {/** @addr: mac address of claimed non-mesh client */ -u8 addr[ETH_ALEN ]; +u8 addr[ETH_ALEN ]__aligned(2) ;/** @vid: vlan id this client was detected on */ unsigned short vid;
@@ -1840,7 +1840,7 @@ struct batadv_bla_claim {*/ struct batadv_tt_common_entry {/** @addr: mac address of non-mesh client */ -u8 addr[ETH_ALEN ]; +u8 addr[ETH_ALEN ]__aligned(2) ;/** @vid: VLAN identifier */ unsigned short vid;
@@ -1942,7 +1942,7 @@ struct batadv_tt_req_node {/** * @addr: mac address of the originator this request was sent to */ -u8 addr[ETH_ALEN ]; +u8 addr[ETH_ALEN ]__aligned(2) ;/** @issued_at: timestamp used for purging stale tt requests */ unsigned long issued_at;
@@ -1959,7 +1959,7 @@ struct batadv_tt_req_node {*/ struct batadv_tt_roam_node {/** @addr: mac address of the client in the roaming phase */ -u8 addr[ETH_ALEN ]; +u8 addr[ETH_ALEN ]__aligned(2) ;/** @vid: VLAN identifier */ u16 vid;
@@ -2204,7 +2204,7 @@ struct batadv_hw_addr {struct hlist_node list;/** @addr: the MAC address of this list entry */ -unsigned char addr[ETH_ALEN ]; +unsigned char addr[ETH_ALEN ]__aligned(2) ; };/**
Signature · 1 line
2.47.3