Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / ipv6 / ah6.c

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index ed7d4e3f9c108961fed9ae3144328cc797fed3f9..0630a4d5daaabaf9a294c18c398ab569ed74661c 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -577,8 +577,10 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
 
        work_iph = ah_alloc_tmp(ahash, nfrags + sglists, hdr_len +
                                ahp->icv_trunc_len + seqhi_len);
-       if (!work_iph)
+       if (!work_iph) {
+               err = -ENOMEM;
                goto out;
+       }
 
        auth_data = ah_tmp_auth((u8 *)work_iph, hdr_len);
        seqhi = (__be32 *)(auth_data + ahp->icv_trunc_len);