From e6bb653852fd863d686a9f8c70553cff2345fcd9 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Sat, 16 Feb 2013 07:38:15 +0000 Subject: [PATCH] --- yaml --- r: 352515 b: refs/heads/master c: 0d4bfa297c3f7efb71367449ee44f9d3fb0f5871 h: refs/heads/master i: 352513: 1f7a41e9a0268849a981e6cc9791995dbc2ee76e 352511: b38dfb9b2fd0a58f80af963c13211da48413a680 v: v3 --- [refs] | 2 +- trunk/net/ipv6/xfrm6_mode_tunnel.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dcd1e7734981..52ce045becb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f219d5fb1184bda8398e5ab9fb2910a202e2c94 +refs/heads/master: 0d4bfa297c3f7efb71367449ee44f9d3fb0f5871 diff --git a/trunk/net/ipv6/xfrm6_mode_tunnel.c b/trunk/net/ipv6/xfrm6_mode_tunnel.c index 93c41a81c4c3..9bf6a74a71d2 100644 --- a/trunk/net/ipv6/xfrm6_mode_tunnel.c +++ b/trunk/net/ipv6/xfrm6_mode_tunnel.c @@ -69,7 +69,8 @@ static int xfrm6_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) goto out; - if (err = skb_unclone(skb, GFP_ATOMIC)) + err = skb_unclone(skb, GFP_ATOMIC); + if (err) goto out; if (x->props.flags & XFRM_STATE_DECAP_DSCP)