batman-adv: fix skb deref after free
Commit Message
batadv_send_skb_to_orig() calls dev_queue_xmit() so we can't use skb->len.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
Noticed during review, compile tested only.
net/batman-adv/routing.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Comments
On Tuesday 10 May 2016 23:17:59 Florian Westphal wrote:
> batadv_send_skb_to_orig() calls dev_queue_xmit() so we can't use skb->len.
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> Noticed during review, compile tested only.
Fixes: d28785996ad8 ("batman-adv: network coding - buffer unicast packets before forward")
Reviewed-by: Sven Eckelmann <sven@narfation.org>
Kind regards,
Sven
On Tuesday, May 10, 2016 23:58:28 Sven Eckelmann wrote:
> On Tuesday 10 May 2016 23:17:59 Florian Westphal wrote:
> > batadv_send_skb_to_orig() calls dev_queue_xmit() so we can't use skb->len.
> >
> > Signed-off-by: Florian Westphal <fw@strlen.de>
> > ---
> >
> > Noticed during review, compile tested only.
>
> Fixes: d28785996ad8 ("batman-adv: network coding - buffer unicast packets
> before forward") Reviewed-by: Sven Eckelmann <sven@narfation.org>
Applied in revision 6863d3b.
Thanks,
Marek
@@ -601,6 +601,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
struct batadv_unicast_packet *unicast_packet;
struct ethhdr *ethhdr = eth_hdr(skb);
int res, hdr_len, ret = NET_RX_DROP;
+ unsigned int len;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
@@ -641,6 +642,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
if (hdr_len > 0)
batadv_skb_set_priority(skb, hdr_len);
+ len = skb->len;
res = batadv_send_skb_to_orig(skb, orig_node, recv_if);
/* translate transmit result into receive result */
@@ -648,7 +650,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
/* skb was transmitted and consumed */
batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
- skb->len + ETH_HLEN);
+ len + ETH_HLEN);
ret = NET_RX_SUCCESS;
} else if (res == NET_XMIT_POLICED) {