lkml.org 
[lkml]   [2016]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.3 171/200] crypto: algif_skcipher - Remove custom release parent function
    Date
    4.3-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Herbert Xu <herbert@gondor.apana.org.au>

    commit d7b65aee1e7b4c87922b0232eaba56a8a143a4a0 upstream.

    This patch removes the custom release parent function as the
    generic af_alg_release_parent now works for nokey sockets too.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/algif_skcipher.c | 43 +++----------------------------------------
    1 file changed, 3 insertions(+), 40 deletions(-)

    --- a/crypto/algif_skcipher.c
    +++ b/crypto/algif_skcipher.c
    @@ -895,7 +895,7 @@ static void skcipher_wait(struct sock *s
    msleep(100);
    }

    -static void skcipher_sock_destruct_common(struct sock *sk)
    +static void skcipher_sock_destruct(struct sock *sk)
    {
    struct alg_sock *ask = alg_sk(sk);
    struct skcipher_ctx *ctx = ask->private;
    @@ -907,33 +907,10 @@ static void skcipher_sock_destruct_commo
    skcipher_free_sgl(sk);
    sock_kzfree_s(sk, ctx->iv, crypto_skcipher_ivsize(tfm));
    sock_kfree_s(sk, ctx, ctx->len);
    -}
    -
    -static void skcipher_sock_destruct(struct sock *sk)
    -{
    - skcipher_sock_destruct_common(sk);
    - af_alg_release_parent(sk);
    -}
    -
    -static void skcipher_release_parent_nokey(struct sock *sk)
    -{
    - struct alg_sock *ask = alg_sk(sk);
    -
    - if (!ask->refcnt) {
    - sock_put(ask->parent);
    - return;
    - }
    -
    af_alg_release_parent(sk);
    }

    -static void skcipher_sock_destruct_nokey(struct sock *sk)
    -{
    - skcipher_sock_destruct_common(sk);
    - skcipher_release_parent_nokey(sk);
    -}
    -
    -static int skcipher_accept_parent_common(void *private, struct sock *sk)
    +static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
    {
    struct skcipher_ctx *ctx;
    struct alg_sock *ask = alg_sk(sk);
    @@ -981,21 +958,7 @@ static int skcipher_accept_parent(void *
    if (!tfm->has_key && crypto_skcipher_has_setkey(tfm->skcipher))
    return -ENOKEY;

    - return skcipher_accept_parent_common(private, sk);
    -}
    -
    -static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
    -{
    - int err;
    -
    - err = skcipher_accept_parent_common(private, sk);
    - if (err)
    - goto out;
    -
    - sk->sk_destruct = skcipher_sock_destruct_nokey;
    -
    -out:
    - return err;
    + return skcipher_accept_parent_nokey(private, sk);
    }

    static const struct af_alg_type algif_type_skcipher = {

    \
     
     \ /
      Last update: 2016-02-15 01:21    [W:4.058 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site