Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7142fc10 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Remove hdr_size skb size check in batadv_interface_rx 



The callers of batadv_interface_rx have to make sure that enough data can
be pulled from the skb when they read the batman-adv header. The only two
functions using it are either calling pskb_may_pull with hdr_size directly
(batadv_recv_bcast_packet) or indirectly via batadv_check_unicast_packet
(batadv_recv_unicast_packet).

Reported-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 6535db56

net/batman-adv/soft-interface.c

+0 −4
Original line number Diff line number Diff line
@@ -413,10 +413,6 @@ void batadv_interface_rx(struct net_device *soft_iface, 
	batadv_bcast_packet = (struct batadv_bcast_packet *)skb->data;

	is_bcast = (batadv_bcast_packet->packet_type == BATADV_BCAST);



	/* check if enough space is available for pulling, and pull */

	if (!pskb_may_pull(skb, hdr_size))

		goto dropped;



	skb_pull_rcsum(skb, hdr_size);

	skb_reset_mac_header(skb);