ip_gre: fix ipgre_header to return correct offset
Fix ipgre_header() (header_ops->create) to return the correct
amount of bytes pushed. Most callers of dev_hard_header() seem
to care only if it was success, but af_packet.c uses it as
offset to the skb to copy from userspace only once. In practice
this fixes packet socket sendto()/sendmsg() to gre tunnels.
Regression introduced in c544193214
("GRE: Refactor GRE tunneling code.")
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
75848d338c
Коммит
77a482bdb2
|
@ -383,7 +383,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
|
|||
if (daddr)
|
||||
memcpy(&iph->daddr, daddr, 4);
|
||||
if (iph->daddr)
|
||||
return t->hlen;
|
||||
return t->hlen + sizeof(*iph);
|
||||
|
||||
return -(t->hlen + sizeof(*iph));
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче