android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally

Browse Source 
ipgre_tunnel_xmit() parses network header as IP unconditionally.
But transmitting packets are not always IP packet. For example such packet
can be sent by packet socket with sockaddr_ll.sll_protocol set.
So make the function check if skb->protocol is IP.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Isaku Yamahata 2012-12-20 15:12:52 +00:00 committed by David S. Miller
parent 29042073e7
commit 412ed94744
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/ip_gre.c
View File

@ -760,7 +760,10 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
if (dev->header_ops && dev->type == ARPHRD_IPGRE) { if (dev->header_ops && dev->type == ARPHRD_IPGRE) {
gre_hlen = 0; gre_hlen = 0;
tiph = (const struct iphdr *)skb->data; if (skb->protocol == htons(ETH_P_IP))
tiph = (const struct iphdr *)skb->data;
else
tiph = &tunnel->parms.iph;
} else { } else {
gre_hlen = tunnel->hlen; gre_hlen = tunnel->hlen;
tiph = &tunnel->parms.iph; tiph = &tunnel->parms.iph;