Commit 82dd0d2a authored by David Ahern's avatar David Ahern Committed by David S. Miller

vrf: Fix use after free and double free in vrf_finish_output

Miguel reported an skb use after free / double free in vrf_finish_output
when neigh_output returns an error. The vrf driver should return after
the call to neigh_output as it takes over the skb on error path as well.

Patch is a simplified version of Miguel's patch which was written for 4.9,
and updated to top of tree.

Fixes: 8f58336d ("net: Add ethernet header for pass through VRF device")
Signed-off-by: default avatarMiguel Fadon Perlines <mfadon@teldat.com>
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5807b22c
...@@ -578,11 +578,12 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s ...@@ -578,11 +578,12 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s
if (!IS_ERR(neigh)) { if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh); sock_confirm_neigh(skb, neigh);
ret = neigh_output(neigh, skb); ret = neigh_output(neigh, skb);
rcu_read_unlock_bh();
return ret;
} }
rcu_read_unlock_bh(); rcu_read_unlock_bh();
err: err:
if (unlikely(ret < 0))
vrf_tx_error(skb->dev, skb); vrf_tx_error(skb->dev, skb);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment