Commit 4103bc54 authored Jul 15, 2020 by Colin Ian King Committed by Greg Kroah-Hartman Jun 25, 2022

xprtrdma: fix incorrect header size calculations



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: 302d3deb ("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.19: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a3680994

net/sunrpc/xprtrdma/rpc_rdma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ static unsigned int rpcrdma_max_call_header_size(unsigned int maxsegs)

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

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

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