From 8573ab0c6eff9d0db0c0ed42a2a54ca761ba58fe Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 29 Aug 2012 06:49:12 +0000 Subject: [PATCH] --- yaml --- r: 322454 b: refs/heads/master c: 48f125ce1cc3ff275f9587b5bf56bf0f90766c7d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/esp6.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9a6c34bb743c..6911abb19aa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa026e223df2514b271b20f839ab05d7f21181b9 +refs/heads/master: 48f125ce1cc3ff275f9587b5bf56bf0f90766c7d diff --git a/trunk/net/ipv6/esp6.c b/trunk/net/ipv6/esp6.c index 6dc7fd353ef5..282f3723ee19 100644 --- a/trunk/net/ipv6/esp6.c +++ b/trunk/net/ipv6/esp6.c @@ -167,8 +167,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) struct esp_data *esp = x->data; /* skb is pure payload to encrypt */ - err = -ENOMEM; - aead = esp->aead; alen = crypto_aead_authsize(aead); @@ -203,8 +201,10 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) } tmp = esp_alloc_tmp(aead, nfrags + sglists, seqhilen); - if (!tmp) + if (!tmp) { + err = -ENOMEM; goto error; + } seqhi = esp_tmp_seqhi(tmp); iv = esp_tmp_iv(aead, tmp, seqhilen);