niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: hdlc_fr: Do skb_reset_mac_header for skbs received on normal PVC devices

Browse source 
When an skb is received on a normal (non-Ethernet-emulating) PVC device,
call skb_reset_mac_header before we pass it to upper layers.

This is because normal PVC devices don't have header_ops, so any header we
have would not be visible to upper layer code when sending, so the header
shouldn't be visible to upper layer code when receiving, either.

Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Signed-off-by: Xie He <xie.he.0141@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Xie He 2020-10-31 11:10:41 -07:00 • committed by Jakub Kicinski
parent 14b20704a1
commit efc790394f
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wan/hdlc_fr.c
View file

@ -935,6 +935,7 @@ static int fr_rx(struct sk_buff *skb)
skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */ skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */
skb->dev = pvc->main; skb->dev = pvc->main;
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
skb_reset_mac_header(skb);
} else if (data[3] == NLPID_IPV6) { } else if (data[3] == NLPID_IPV6) {
if (!pvc->main) if (!pvc->main)
@ -942,6 +943,7 @@ static int fr_rx(struct sk_buff *skb)
skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */ skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */
skb->dev = pvc->main; skb->dev = pvc->main;
skb->protocol = htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
skb_reset_mac_header(skb);
} else if (skb->len > 10 && data[3] == FR_PAD && } else if (skb->len > 10 && data[3] == FR_PAD &&
data[4] == NLPID_SNAP && data[5] == FR_PAD) { data[4] == NLPID_SNAP && data[5] == FR_PAD) {
@ -958,6 +960,7 @@ static int fr_rx(struct sk_buff *skb)
goto rx_drop; goto rx_drop;
skb->dev = pvc->main; skb->dev = pvc->main;
skb->protocol = htons(pid); skb->protocol = htons(pid);
skb_reset_mac_header(skb);
break; break;
case 0x80C20007: /* bridged Ethernet frame */ case 0x80C20007: /* bridged Ethernet frame */