svcrdma: fix bounce buffers for unaligned offsets and multiple pages

[ Upstream commit c327a310ec4d6ecbea13185ed56c11def441d9ab ]

This was discovered using O_DIRECT at the client side, with small
unaligned file offsets or IOs that span multiple file pages.

Fixes: e248aa7be86 ("svcrdma: Remove max_sge check at connect time")
Signed-off-by: Dan Aloni <dan@kernelim.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 217106c66a13c0823e257f1967a16b350501c3fc..25e8922c10b28ef08f9a46e6d6f6130d76b0ef50 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -609,10 +609,11 @@ static int svc_rdma_pull_up_reply_msg(struct svcxprt_rdma *rdma,
                while (remaining) {
                        len = min_t(u32, PAGE_SIZE - pageoff, remaining);
 
-                       memcpy(dst, page_address(*ppages), len);
+                       memcpy(dst, page_address(*ppages) + pageoff, len);
                        remaining -= len;
                        dst += len;
                        pageoff = 0;
+                       ppages++;
                }
        }