lkml.org 
[lkml]   [2016]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 092/136] crypto: af_alg - Fix socket double-free when accept fails
    Date
    3.13.11-ckt34 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit a383292c86663bbc31ac62cc0c04fc77504636a6 upstream.

    When we fail an accept(2) call we will end up freeing the socket
    twice, once due to the direct sk_free call and once again through
    newsock.

    This patch fixes this by removing the sk_free call.

    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    crypto/af_alg.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/crypto/af_alg.c b/crypto/af_alg.c
    index abb828a..1971f3c 100644
    --- a/crypto/af_alg.c
    +++ b/crypto/af_alg.c
    @@ -275,10 +275,8 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
    security_sk_clone(sk, sk2);

    err = type->accept(ask->private, sk2);
    - if (err) {
    - sk_free(sk2);
    + if (err)
    goto unlock;
    - }

    sk2->sk_family = PF_ALG;

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