summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDan Aloni <dan@kernelim.com>2020-10-02 22:33:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 09:57:55 +0100
commit9c27185e12e8c2317e5b1507fdf9c23a99d39c7a (patch)
tree291a4a3953d4531f19d206763e398db9f7573951 /net
parent120222811b2e9daf16ce8ed2c27b3a36821477ef (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_sendto.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 217106c66a13..25e8922c10b2 100644
--- 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++;
}
}