summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/socklib.c
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2016-04-07 17:44:58 +0200
committerDavid S. Miller <davem@davemloft.net>2016-04-11 21:31:33 +0200
commit1da8c681d5c122afe9fbadc02e92a0f9e3f7af44 (patch)
tree16d382daa5ef48f18f4afe6b0766d35a5a5f45b0 /net/sunrpc/socklib.c
parentnet: ipv4: Consider failed nexthops in multipath routes (diff)
downloadlinux-1da8c681d5c122afe9fbadc02e92a0f9e3f7af44.tar.xz
linux-1da8c681d5c122afe9fbadc02e92a0f9e3f7af44.zip
sunrpc: do not pull udp headers on receive
Commit e6afc8ace6dd modified the udp receive path by pulling the udp header before queuing an skbuff onto the receive queue. Sunrpc also calls skb_recv_datagram to dequeue an skb from a udp socket. Modify this receive path to also no longer expect udp headers. Fixes: e6afc8ace6dd ("udp: remove headers from UDP packets before queueing") Reported-by: Franklin S Cooper Jr. <fcooper@ti.com> Signed-off-by: Willem de Bruijn <willemb@google.com> Tested-by: Thierry Reding <treding@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/socklib.c')
-rw-r--r--net/sunrpc/socklib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/socklib.c b/net/sunrpc/socklib.c
index de70c78025d7..f217c348b341 100644
--- a/net/sunrpc/socklib.c
+++ b/net/sunrpc/socklib.c
@@ -155,7 +155,7 @@ int csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
struct xdr_skb_reader desc;
desc.skb = skb;
- desc.offset = sizeof(struct udphdr);
+ desc.offset = 0;
desc.count = skb->len - desc.offset;
if (skb_csum_unnecessary(skb))