lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 158/268] crypto: af_alg - Forbid bind(2) when nokey child sockets are present
    Date
    4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

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

    commit a6a48c565f6f112c6983e2a02b1602189ed6e26e upstream.

    This patch forbids the calling of bind(2) when there are child
    sockets created by accept(2) in existence, even if they are created
    on the nokey path.

    This is needed as those child sockets have references to the tfm
    object which bind(2) will destroy.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    crypto/af_alg.c | 16 +++++++---------
    1 file changed, 7 insertions(+), 9 deletions(-)

    diff --git a/crypto/af_alg.c b/crypto/af_alg.c
    index e7cb836..f5e18c2 100644
    --- a/crypto/af_alg.c
    +++ b/crypto/af_alg.c
    @@ -130,19 +130,16 @@ EXPORT_SYMBOL_GPL(af_alg_release);
    void af_alg_release_parent(struct sock *sk)
    {
    struct alg_sock *ask = alg_sk(sk);
    - bool last;
    + unsigned int nokey = ask->nokey_refcnt;
    + bool last = nokey && !ask->refcnt;

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

    lock_sock(sk);
    - last = !--ask->refcnt;
    + ask->nokey_refcnt -= nokey;
    + if (!last)
    + last = !--ask->refcnt;
    release_sock(sk);

    if (last)
    @@ -188,7 +185,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)

    err = -EBUSY;
    lock_sock(sk);
    - if (ask->refcnt)
    + if (ask->refcnt | ask->nokey_refcnt)
    goto unlock;

    swap(ask->type, type);
    @@ -306,6 +303,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)

    if (nokey || !ask->refcnt++)
    sock_hold(sk);
    + ask->nokey_refcnt += nokey;
    alg_sk(sk2)->parent = sk;
    alg_sk(sk2)->type = type;
    alg_sk(sk2)->nokey_refcnt = nokey;
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-27 23:01    [W:4.073 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site