mirror of
https://github.com/torvalds/linux.git
synced 2024-10-23 05:30:55 +00:00
net: hdlc_fr: Do skb_reset_mac_header for skbs received on normal PVC devices
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:
parent
14b20704a1
commit
efc790394f
|
@ -935,6 +935,7 @@ static int fr_rx(struct sk_buff *skb)
|
|||
skb_pull(skb, 4); /* Remove 4-byte header (hdr, UI, NLPID) */
|
||||
skb->dev = pvc->main;
|
||||
skb->protocol = htons(ETH_P_IP);
|
||||
skb_reset_mac_header(skb);
|
||||
|
||||
} else if (data[3] == NLPID_IPV6) {
|
||||
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->dev = pvc->main;
|
||||
skb->protocol = htons(ETH_P_IPV6);
|
||||
skb_reset_mac_header(skb);
|
||||
|
||||
} else if (skb->len > 10 && data[3] == 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;
|
||||
skb->dev = pvc->main;
|
||||
skb->protocol = htons(pid);
|
||||
skb_reset_mac_header(skb);
|
||||
break;
|
||||
|
||||
case 0x80C20007: /* bridged Ethernet frame */
|
||||
|
|
Loading…
Reference in New Issue
Block a user