From 53bbaae5468c9689cee19c68e4e8aed1364132d5 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Sat, 16 Feb 2013 07:40:29 +0000 Subject: [PATCH] --- yaml --- r: 352516 b: refs/heads/master c: 9aac22deb11a3da4df5b868fc3d30b07185b0d71 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/xfrm4_mode_tunnel.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 52ce045becb2..0263d6015e84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d4bfa297c3f7efb71367449ee44f9d3fb0f5871 +refs/heads/master: 9aac22deb11a3da4df5b868fc3d30b07185b0d71 diff --git a/trunk/net/ipv4/xfrm4_mode_tunnel.c b/trunk/net/ipv4/xfrm4_mode_tunnel.c index 1162ace30838..fe5189e2e114 100644 --- a/trunk/net/ipv4/xfrm4_mode_tunnel.c +++ b/trunk/net/ipv4/xfrm4_mode_tunnel.c @@ -142,7 +142,8 @@ static int xfrm4_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) for_each_input_rcu(rcv_notify_handlers, handler) handler->handler(skb); - 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)