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

Commit 4d0fc73e authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

rxrpc: do not pull udp headers on receive 



Commit e6afc8ac modified the udp receive path by pulling the udp
header before queuing an skbuff onto the receive queue.

Rxrpc 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: e6afc8ac ("udp: remove headers from UDP packets before queueing")

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1da8c681

net/rxrpc/ar-input.c

+2 −2
Original line number Diff line number Diff line
@@ -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));