diff options
| author | David Ahern <dsahern@gmail.com> | 2018-03-29 12:49:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-30 14:20:23 -0400 |
| commit | 82dd0d2a9a76fc8fa2b18d80b987d455728bf83a (patch) | |
| tree | 7f3f8308095869a157d285eb2bd95b9f2f894c3e /drivers | |
| parent | 5807b22c9164a21cd1077a9bc587f0bba361f72d (diff) | |
| download | linux-riscv-82dd0d2a9a76fc8fa2b18d80b987d455728bf83a.tar.gz linux-riscv-82dd0d2a9a76fc8fa2b18d80b987d455728bf83a.tar.bz2 linux-riscv-82dd0d2a9a76fc8fa2b18d80b987d455728bf83a.zip | |
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: 8f58336d3f78a ("net: Add ethernet header for pass through VRF device")
Signed-off-by: Miguel Fadon Perlines <mfadon@teldat.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/vrf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 139c61c8244a..ac40924fe437 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -578,12 +578,13 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s if (!IS_ERR(neigh)) { sock_confirm_neigh(skb, neigh); ret = neigh_output(neigh, skb); + rcu_read_unlock_bh(); + return ret; } rcu_read_unlock_bh(); err: - if (unlikely(ret < 0)) - vrf_tx_error(skb->dev, skb); + vrf_tx_error(skb->dev, skb); return ret; } |