lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 56/92] crypto: af_alg - Initialize sg_num_bytes in error code path
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Stephan Mueller <smueller@chronox.de>

    commit 2546da99212f22034aecf279da9c47cbfac6c981 upstream.

    The RX SGL in processing is already registered with the RX SGL tracking
    list to support proper cleanup. The cleanup code path uses the
    sg_num_bytes variable which must therefore be always initialized, even
    in the error code path.

    Signed-off-by: Stephan Mueller <smueller@chronox.de>
    Reported-by: syzbot+9c251bdd09f83b92ba95@syzkaller.appspotmail.com
    #syz test: https://github.com/google/kmsan.git master
    CC: <stable@vger.kernel.org> #4.14
    Fixes: e870456d8e7c ("crypto: algif_skcipher - overhaul memory management")
    Fixes: d887c52d6ae4 ("crypto: algif_aead - overhaul memory management")
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/af_alg.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/crypto/af_alg.c
    +++ b/crypto/af_alg.c
    @@ -1183,8 +1183,10 @@ int af_alg_get_rsgl(struct sock *sk, str

    /* make one iovec available as scatterlist */
    err = af_alg_make_sg(&rsgl->sgl, &msg->msg_iter, seglen);
    - if (err < 0)
    + if (err < 0) {
    + rsgl->sg_num_bytes = 0;
    return err;
    + }

    /* chain the new scatterlist with previous one */
    if (areq->last_rsgl)

    \
     
     \ /
      Last update: 2018-07-20 14:40    [W:4.043 / U:1.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site