Merge branch 'udp-pull'

Willem de Bruijn says:

====================
net: fix udp pull header breakage

Commit e6afc8ace6dd ("udp: remove headers from UDP packets before
queueing") modified udp receive processing to pull headers before
enqueue and to not expect them on dequeue.

The patch missed protocols on top of udp with in-kernel
implementations that have their own skb_recv_datagram calls and
dequeue logic. Modify these datapaths to also no longer expect
a udp header at skb->data.

Sunrpc and rxrpc are the only two protocols that call this
function and contain references to udphr (some others, like tipc,
are based on encap_rcv, which acts before enqueue, before the
the header pull).
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
index 63ed75c40e29..4824a827d10d 100644
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
@@ -612,9 +612,9 @@ int rxrpc_extract_header(struct rxrpc_skb_priv *sp, struct sk_buff *skb)
         struct rxrpc_wire_header whdr;
 
         /* dig out the RxRPC connection details */
-        if (skb_copy_bits(skb, sizeof(struct udphdr), &whdr, sizeof(whdr)) < 0)
+        if (skb_copy_bits(skb, 0, &whdr, sizeof(whdr)) < 0)
                 return -EBADMSG;
-        if (!pskb_pull(skb, sizeof(struct udphdr) + sizeof(whdr)))
+        if (!pskb_pull(skb, sizeof(whdr)))
                 BUG();
 
         memset(sp, 0, sizeof(*sp));