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

Commit e433430a authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

dst: Clone child entry in skb_dst_pop 



We clone the child entry in skb_dst_pop before we call
skb_dst_drop(). Otherwise we might kill the child right
before we return it to the caller.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bc07321

include/net/dst.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev) 


static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)

{

	struct dst_entry *child = skb_dst(skb)->child;

	struct dst_entry *child = dst_clone(skb_dst(skb)->child);



	skb_dst_drop(skb);

	return child;

net/xfrm/xfrm_output.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) 
			err = -EHOSTUNREACH;

			goto error_nolock;

		}

		skb_dst_set(skb, dst_clone(dst));

		skb_dst_set(skb, dst);

		x = dst->xfrm;

	} while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL));