diff options
| author | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
| commit | aadf030d84352a91cdadf50f947da739c5611450 (patch) | |
| tree | 5f22ec57ee257776b4c157f0c91f3612f05ed6c5 /net/key/af_key.c | |
| parent | aad2732ba0dddcf3446a4e3c4843496759c1c305 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge commit 'v3.4-rc5' into android-3.4
Diffstat (limited to 'net/key/af_key.c')
| -rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 11dbb2255cc..7e5d927b576 100644 --- a/net/key/af_key.c +++ b/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); |