rxrpc: do not pull udp headers on receive
Commite6afc8ace6
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:e6afc8ace6
("udp: remove headers from UDP packets before queueing") 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>
This commit is contained in:
Родитель
1da8c681d5
Коммит
4d0fc73ebe
|
@ -612,9 +612,9 @@ int rxrpc_extract_header(struct rxrpc_skb_priv *sp, struct sk_buff *skb)
|
||||||
struct rxrpc_wire_header whdr;
|
struct rxrpc_wire_header whdr;
|
||||||
|
|
||||||
/* dig out the RxRPC connection details */
|
/* 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;
|
return -EBADMSG;
|
||||||
if (!pskb_pull(skb, sizeof(struct udphdr) + sizeof(whdr)))
|
if (!pskb_pull(skb, sizeof(whdr)))
|
||||||
BUG();
|
BUG();
|
||||||
|
|
||||||
memset(sp, 0, sizeof(*sp));
|
memset(sp, 0, sizeof(*sp));
|
||||||
|
|
Загрузка…
Ссылка в новой задаче