From f687a6cb1e41a67c86aa40eada4cf2012216de8a Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sun, 8 Apr 2012 22:41:10 +0000
Subject: [PATCH] --- yaml --- r: 299518 b: refs/heads/master c:
 89eb06f11c314c2ab4ec59039715dc021933a7a0 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/key/af_key.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb36b62f2db0..9a7736bc2656 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03478756b1b9298686ca9c8793e484ae39eb4649
+refs/heads/master: 89eb06f11c314c2ab4ec59039715dc021933a7a0
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index 11dbb2255ccb..7e5d927b576f 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -3480,7 +3480,7 @@ static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
 
 	/* Addresses to be used by KM for negotiation, if ext is available */
 	if (k != NULL && (set_sadb_kmaddress(skb, k) < 0))
-		return -EINVAL;
+		goto err;
 
 	/* selector src */
 	set_sadb_address(skb, sasize_sel, SADB_EXT_ADDRESS_SRC, sel);