crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path

commit 6a935170a980024dd29199e9dbb5c4da4767a1b9 upstream.

This patch allows af_alg_release_parent to be called even for
nokey sockets.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index de130c2..2f8fd84 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -133,6 +133,12 @@ void af_alg_release_parent(struct sock *sk)
        bool last;
 
        sk = ask->parent;
        bool last;
 
        sk = ask->parent;

+
+       if (ask->nokey_refcnt && !ask->refcnt) {
+               sock_put(sk);
+               return;
+       }
+

        ask = alg_sk(sk);
 
        lock_sock(sk);
        ask = alg_sk(sk);
 
        lock_sock(sk);


@@ -258,8 +264,8 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
        struct alg_sock *ask = alg_sk(sk);
        const struct af_alg_type *type;
        struct sock *sk2;
        struct alg_sock *ask = alg_sk(sk);
        const struct af_alg_type *type;
        struct sock *sk2;

+       unsigned int nokey;

        int err;
        int err;

-       bool nokey;

 
        lock_sock(sk);
        type = ask->type;
 
        lock_sock(sk);
        type = ask->type;


@@ -292,6 +298,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
                sock_hold(sk);
        alg_sk(sk2)->parent = sk;
        alg_sk(sk2)->type = type;
                sock_hold(sk);
        alg_sk(sk2)->parent = sk;
        alg_sk(sk2)->type = type;

+       alg_sk(sk2)->nokey_refcnt = nokey;

 
        newsock->ops = type->ops;
        newsock->state = SS_CONNECTED;
 
        newsock->ops = type->ops;
        newsock->state = SS_CONNECTED;

diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 9e6a2f3..bfefd81 100644 (file)
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -31,6 +31,7 @@ struct alg_sock {
        struct sock *parent;
 
        unsigned int refcnt;
        struct sock *parent;
 
        unsigned int refcnt;

+       unsigned int nokey_refcnt;

 
        const struct af_alg_type *type;
        void *private;
 
        const struct af_alg_type *type;
        void *private;