1 files changed, 4 insertions, 9 deletions

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 8e10e9098a83..52c7fce54641 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -784,16 +784,11 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
         if (x == NULL)
                 goto out_noput;
 
-        resp_skb = ERR_PTR(-ENOENT);
-
-        spin_lock_bh(&x->lock);
-        if (x->km.state != XFRM_STATE_DEAD) {
-                xfrm_alloc_spi(x, htonl(p->min), htonl(p->max));
-                if (x->id.spi)
-                        resp_skb = xfrm_state_netlink(skb, x, nlh->nlmsg_seq);
-        }
-        spin_unlock_bh(&x->lock);
+        err = xfrm_alloc_spi(x, p->min, p->max);
+        if (err)
+                goto out;
 
+        resp_skb = xfrm_state_netlink(skb, x, nlh->nlmsg_seq);
         if (IS_ERR(resp_skb)) {
                 err = PTR_ERR(resp_skb);
                 goto out;