diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-13 19:30:55 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-13 19:36:48 +0400 |
| commit | e65ac4d54546b7d7514a9e8be1484c758f2b7ba3 (patch) | |
| tree | 7b4bffabbe75739310e200360789e25732540da0 /net/key | |
| parent | 816a7854d56f19aeba3c83e1ed8c2c0ef275365a (diff) | |
| parent | d62f8dbb5b7771910f7c4657345df8ac93acb832 (diff) | |
| download | linux-e65ac4d54546b7d7514a9e8be1484c758f2b7ba3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get CAIF bug fixes upon which
the following set of CAIF feature patches depend.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
| -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 11dbb2255ccb..7e5d927b576f 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); |