FAILED: patch "[PATCH] vrf: Fix use after free and double free in vrf_finish_output" failed to apply to 4.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
82dd0d2a9a76fc8fa2b18d80b987d455728bf83aMon Sep 17 00:00:00 2001
From: David Ahern <[email protected]>
Date: Thu, 29 Mar 2018 12:49:52 -0700
Subject: [PATCH] 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.
drivers/net/vrf.c +3 -2
@@ -578,12 +578,13 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *sif (!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; }