[IPSEC]: Move common code into xfrm_alloc_spi

This patch moves some common code that conceptually belongs to the xfrm core
from af_key/xfrm_user into xfrm_alloc_spi.

In particular, the spin lock on the state is now taken inside xfrm_alloc_spi.
Previously it also protected the construction of the response PF_KEY/XFRM
messages to user-space.  This is inconsistent as other identical constructions
are not protected by the state lock.  This is bad because they in fact should
be protected but only in certain spots (so as not to hold the lock for too
long which may cause packet drops).

The SPI byte order conversion has also been moved.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 17 deletions

diff --git a/net/key/af_key.c b/net/key/af_key.c
index ff5c3d03005e..143d46f6329a 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1253,8 +1253,11 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
         struct sadb_x_sa2 *sa2;
         struct sadb_address *saddr, *daddr;
         struct sadb_msg *out_hdr;
+        struct sadb_spirange *range;
         struct xfrm_state *x = NULL;
         int mode;
+        int err;
+        u32 min_spi, max_spi;
         u32 reqid;
         u8 proto;
         unsigned short family;
@@ -1309,25 +1312,17 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
         if (x == NULL)
                 return -ENOENT;
 
-        resp_skb = ERR_PTR(-ENOENT);
-
-        spin_lock_bh(&x->lock);
-        if (x->km.state != XFRM_STATE_DEAD) {
-                struct sadb_spirange *range = ext_hdrs[SADB_EXT_SPIRANGE-1];
-                u32 min_spi, max_spi;
+        min_spi = 0x100;
+        max_spi = 0x0fffffff;
 
-                if (range != NULL) {
-                        min_spi = range->sadb_spirange_min;
-                        max_spi = range->sadb_spirange_max;
-                } else {
-                        min_spi = 0x100;
-                        max_spi = 0x0fffffff;
-                }
-                xfrm_alloc_spi(x, htonl(min_spi), htonl(max_spi));
-                if (x->id.spi)
-                        resp_skb = pfkey_xfrm_state2msg(x, 0, 3);
+        range = ext_hdrs[SADB_EXT_SPIRANGE-1];
+        if (range) {
+                min_spi = range->sadb_spirange_min;
+                max_spi = range->sadb_spirange_max;
         }
-        spin_unlock_bh(&x->lock);
+
+        err = xfrm_alloc_spi(x, min_spi, max_spi);
+        resp_skb = err ? ERR_PTR(err) : pfkey_xfrm_state2msg(x, 0, 3);
 
         if (IS_ERR(resp_skb)) {
                 xfrm_state_put(x);