mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
batman-adv: dat: acquire ARP hw source only after skb realloc
The pskb_may_pull() called by batadv_get_vid() could reallocate the buffer
behind the skb. Variables which were pointing to the old buffer need to be
reassigned to avoid an use-after-free.
Cc: stable@vger.kernel.org
Fixes: b61ec31c85 ("batman-adv: Snoop DHCPACKs for DAT")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
parent
77880a3be8
commit
48067b2ae4
|
|
@ -1747,6 +1747,7 @@ void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv,
|
|||
struct ethhdr *ethhdr;
|
||||
__be32 ip_src, yiaddr;
|
||||
unsigned short vid;
|
||||
int hdr_size_tmp;
|
||||
__be16 proto;
|
||||
u8 *hw_src;
|
||||
|
||||
|
|
@ -1763,8 +1764,10 @@ void batadv_dat_snoop_incoming_dhcp_ack(struct batadv_priv *bat_priv,
|
|||
if (!batadv_dat_check_dhcp_ack(skb, proto, &ip_src, chaddr, &yiaddr))
|
||||
return;
|
||||
|
||||
hdr_size_tmp = hdr_size;
|
||||
vid = batadv_dat_get_vid(skb, &hdr_size_tmp);
|
||||
ethhdr = (struct ethhdr *)(skb->data + hdr_size);
|
||||
hw_src = ethhdr->h_source;
|
||||
vid = batadv_dat_get_vid(skb, &hdr_size);
|
||||
|
||||
batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid);
|
||||
batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user