Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7075a867 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Clean up svc_rdma_build_read_chunk() 



Dan Carpenter <dan.carpenter@oracle.com> observed that the while()
loop in svc_rdma_build_read_chunk() does not document the assumption
that the loop interior is always executed at least once.

Defensive: the function now returns -EINVAL if this assumption
fails.

Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent afea5657

net/sunrpc/xprtrdma/svc_rdma_rw.c

+5 −3
Original line number Diff line number Diff line
@@ -660,19 +660,21 @@ static int svc_rdma_build_read_segment(struct svc_rdma_read_info *info, 
	return -EIO;

}



/* Walk the segments in the Read chunk starting at @p and construct

 * RDMA Read operations to pull the chunk to the server.

 */

static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp,

				     struct svc_rdma_read_info *info,

				     __be32 *p)

{

	int ret;



	ret = -EINVAL;

	info->ri_chunklen = 0;

	while (*p++ != xdr_zero) {

	while (*p++ != xdr_zero && be32_to_cpup(p++) == info->ri_position) {

		u32 rs_handle, rs_length;

		u64 rs_offset;



		if (be32_to_cpup(p++) != info->ri_position)

			break;

		rs_handle = be32_to_cpup(p++);

		rs_length = be32_to_cpup(p++);

		p = xdr_decode_hyper(p, &rs_offset);