Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

A set of overlapping changes in macvlan and the rocker
driver, nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 4 deletions

diff --git a/net/key/af_key.c b/net/key/af_key.c
index ce9b8565d825..376fdcf7a6b9 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1150,6 +1150,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                         goto out;
         }
 
+        err = -ENOBUFS;
         key = ext_hdrs[SADB_EXT_KEY_AUTH - 1];
         if (sa->sadb_sa_auth) {
                 int keysize = 0;
@@ -1161,8 +1162,10 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                 if (key)
                         keysize = (key->sadb_key_bits + 7) / 8;
                 x->aalg = kmalloc(sizeof(*x->aalg) + keysize, GFP_KERNEL);
-                if (!x->aalg)
+                if (!x->aalg) {
+                        err = -ENOMEM;
                         goto out;
+                }
                 strcpy(x->aalg->alg_name, a->name);
                 x->aalg->alg_key_len = 0;
                 if (key) {
@@ -1181,8 +1184,10 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                                 goto out;
                         }
                         x->calg = kmalloc(sizeof(*x->calg), GFP_KERNEL);
-                        if (!x->calg)
+                        if (!x->calg) {
+                                err = -ENOMEM;
                                 goto out;
+                        }
                         strcpy(x->calg->alg_name, a->name);
                         x->props.calgo = sa->sadb_sa_encrypt;
                 } else {
@@ -1196,8 +1201,10 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                         if (key)
                                 keysize = (key->sadb_key_bits + 7) / 8;
                         x->ealg = kmalloc(sizeof(*x->ealg) + keysize, GFP_KERNEL);
-                        if (!x->ealg)
+                        if (!x->ealg) {
+                                err = -ENOMEM;
                                 goto out;
+                        }
                         strcpy(x->ealg->alg_name, a->name);
                         x->ealg->alg_key_len = 0;
                         if (key) {
@@ -1242,8 +1249,10 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                 struct xfrm_encap_tmpl *natt;
 
                 x->encap = kmalloc(sizeof(*x->encap), GFP_KERNEL);
-                if (!x->encap)
+                if (!x->encap) {
+                        err = -ENOMEM;
                         goto out;
+                }
 
                 natt = x->encap;
                 n_type = ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1];
@@ -2742,6 +2751,8 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, const struct sad
         int err, err2;
 
         err = xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, true);
+        if (!err)
+                xfrm_garbage_collect(net);
         err2 = unicast_flush_resp(sk, hdr);
         if (err || err2) {
                 if (err == -ESRCH) /* empty table - old silent behavior */