lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 187/235] tls: Fix zerocopy_from_iter iov handling
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Boris Pismenny <borisp@mellanox.com>

    [ Upstream commit 4718799817c5a30ae723eda21f3a6c7d8701b1a4 ]

    zerocopy_from_iter iterates over the message, but it doesn't revert the
    updates made by the iov iteration. This patch fixes it. Now, the iov can
    be used after calling zerocopy_from_iter.

    Fixes: 3c4d75591 ("tls: kernel TLS support")
    Signed-off-by: Boris Pismenny <borisp@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/tls/tls_sw.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/net/tls/tls_sw.c
    +++ b/net/tls/tls_sw.c
    @@ -286,7 +286,7 @@ static int zerocopy_from_iter(struct soc
    int length, int *pages_used,
    unsigned int *size_used,
    struct scatterlist *to, int to_max_pages,
    - bool charge)
    + bool charge, bool revert)
    {
    struct page *pages[MAX_SKB_FRAGS];

    @@ -337,6 +337,8 @@ static int zerocopy_from_iter(struct soc
    out:
    *size_used = size;
    *pages_used = num_elem;
    + if (revert)
    + iov_iter_revert(from, size);

    return rc;
    }
    @@ -438,7 +440,7 @@ alloc_encrypted:
    &ctx->sg_plaintext_size,
    ctx->sg_plaintext_data,
    ARRAY_SIZE(ctx->sg_plaintext_data),
    - true);
    + true, false);
    if (ret)
    goto fallback_to_reg_send;

    @@ -826,7 +828,7 @@ int tls_sw_recvmsg(struct sock *sk,
    err = zerocopy_from_iter(sk, &msg->msg_iter,
    to_copy, &pages,
    &chunk, &sgin[1],
    - MAX_SKB_FRAGS, false);
    + MAX_SKB_FRAGS, false, true);
    if (err < 0)
    goto fallback_to_reg_recv;


    \
     
     \ /
      Last update: 2018-09-24 14:44    [W:2.652 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site