batman-adv: fix memory access by setting mac_header in DAT
PATCH 1/1 batman-adv: fix memory access by setting mac_header in DAT
In the TX path we now have functions that rely on the skb->mac_header field. DAT does not set such field when creating its own ARP packets thus leading to wrong memory access.
Fix it by always setting the mac_header after having forged the ARP packet.
--- distributed-arp-table.c | 5 +++++ 1 file changed, 5 insertions(+)
distributed-arp-table.c +5 -0
@@ -1028,6 +1028,11 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,if (!skb_new) goto out; +/* the rest of the TX path assumes that the mac_header offset pointing +* to the inner Ethernet header has been set, therefore reset it now. +*/ +skb_reset_mac_header (skb_new); +if (vid &BATADV_VLAN_HAS_TAG ) skb_new =vlan_insert_tag (skb_new,htons (ETH_P_8021Q ), vid &VLAN_VID_MASK );
Signature · 1 line
1.8.5.3
Quoted 11 lines · Antonio Quartulli
In the TX path we now have functions that rely on the
skb->mac_headerfield. DAT does not set such field when creating its own ARP packets thus leading to wrong memory access.Fix it by always setting the
mac_headerafter having forged the ARP packet.Reported-by Russel Senior <[email protected]>Signed-off-by Antonio Quartulli <[email protected]>Tested-by Russel Senior <[email protected]>
This patch is supposed to be applied on maint.
Cheers,
Signature · 1 line
Antonio Quartulli
Quoted 6 lines · Antonio Quartulli
Quoted 5 lines · Antonio Quartulli
In the TX path we now have functions that rely on the
skb->mac_headerfield. DAT does not set such field when creating its own ARP packets thus leading to wrong memory access.
Quoted 8 lines
Quoted 6 lines
Fix it by always setting the
mac_headerafter having forged the ARP packet.Reported-by Russel Senior <[email protected]>Signed-off-by Antonio Quartulli <[email protected]>Tested-by Russel Senior <[email protected]>This patch is supposed to be applied on maint.
Introduced by 41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb ("batman-adv: fix potential kernel paging error for unicast transmissions")
In this patch we have the introduction of eth_hdr() in batadv_send_skb_unicast() which creates the problem..
Cheers,
Signature · 1 line
Antonio Quartulli
Marek Lindner
AppliedQuoted 16 lines · On Tuesday 11 February 2014 11:58:26 Antonio Quartulli wrote:
Quoted 15 lines · Antonio Quartulli
Quoted 11 lines · Antonio Quartulli
In the TX path we now have functions that rely on the
skb->mac_headerfield. DAT does not set such field when creating its own ARP packets thus leading to wrong memory access.Fix it by always setting the
mac_headerafter having forged the ARP packet.Reported-by Russel Senior <[email protected]>Signed-off-by Antonio Quartulli <[email protected]>Tested-by Russel Senior <[email protected]>
Quoted 4 lines
Quoted 1 line
This patch is supposed to be applied on maint.
Introduced by
41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb("batman-adv: fix potential kernel paging error for unicast transmissions")
Applied in revision df99b07.
Thanks,
Marek