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 176/200] crypto: algif_skcipher - Load TX SG list after waiting
    Date
    4.3-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 4f0414e54e4d1893c6f08260693f8ef84c929293 upstream.

    We need to load the TX SG list in sendmsg(2) after waiting for
    incoming data, not before.

    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Tested-by: Dmitry Vyukov <dvyukov@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/algif_skcipher.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/crypto/algif_skcipher.c
    +++ b/crypto/algif_skcipher.c
    @@ -647,13 +647,6 @@ static int skcipher_recvmsg_sync(struct

    lock_sock(sk);
    while (msg_data_left(msg)) {
    - sgl = list_first_entry(&ctx->tsgl,
    - struct skcipher_sg_list, list);
    - sg = sgl->sg;
    -
    - while (!sg->length)
    - sg++;
    -
    if (!ctx->used) {
    err = skcipher_wait_for_data(sk, flags);
    if (err)
    @@ -674,6 +667,13 @@ static int skcipher_recvmsg_sync(struct
    if (!used)
    goto free;

    + sgl = list_first_entry(&ctx->tsgl,
    + struct skcipher_sg_list, list);
    + sg = sgl->sg;
    +
    + while (!sg->length)
    + sg++;
    +
    skcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used,
    ctx->iv);


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