lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 253/264] xprtrdma: fix incorrect header size calculations
    Date
    From: Colin Ian King <colin.king@canonical.com>

    commit 912288442cb2f431bf3c8cb097a5de83bc6dbac1 upstream.

    Currently the header size calculations are using an assignment
    operator instead of a += operator when accumulating the header
    size leading to incorrect sizes. Fix this by using the correct
    operator.

    Addresses-Coverity: ("Unused value")
    Fixes: 302d3deb2068 ("xprtrdma: Prevent inline overflow")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    [bwh: Backported to 4.9: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/sunrpc/xprtrdma/rpc_rdma.c
    +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
    @@ -75,7 +75,7 @@ static unsigned int rpcrdma_max_call_hea

    /* Maximum Read list size */
    maxsegs += 2; /* segment for head and tail buffers */
    - size = maxsegs * sizeof(struct rpcrdma_read_chunk);
    + size += maxsegs * sizeof(struct rpcrdma_read_chunk);

    /* Minimal Read chunk size */
    size += sizeof(__be32); /* segment count */
    @@ -101,7 +101,7 @@ static unsigned int rpcrdma_max_reply_he

    /* Maximum Write list size */
    maxsegs += 2; /* segment for head and tail buffers */
    - size = sizeof(__be32); /* segment count */
    + size += sizeof(__be32); /* segment count */
    size += maxsegs * sizeof(struct rpcrdma_segment);
    size += sizeof(__be32); /* list discriminator */


    \
     
     \ /
      Last update: 2022-06-23 19:16    [W:4.056 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site