* [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg
@ 2013-12-12 8:53 Timo Teräs
2013-12-12 20:34 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Timo Teräs @ 2013-12-12 8:53 UTC (permalink / raw)
To: netdev; +Cc: Timo Teräs, Pravin B Shelar
ipgre_header_parse() needs to parse the tunnel's ip header for getting
the link-layer addresses, and uses mac_header to get the header. This
fixes setting mac_header on the receive path to original behaviour.
Bug added in commit c54419321455 (GRE: Refactor GRE tunneling code.)
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
---
Alternate would be to do skb_reset_inner_headers() in ip_tunnel_rcv() and
update ipgre_header_parse() to use skb_inner_network_header(). Though, then
inner would then be referring to the "outer" headers.
If applied as-is, should go to -stable too.
net/ipv4/ip_gre.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index d7aea4c..cc2c7f1 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -217,6 +217,7 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
iph->saddr, iph->daddr, tpi->key);
if (tunnel) {
+ skb->mac_header = skb->network_header;
ip_tunnel_rcv(tunnel, skb, tpi, log_ecn_error);
return PACKET_RCVD;
}
--
1.8.5.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg
2013-12-12 8:53 [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg Timo Teräs
@ 2013-12-12 20:34 ` David Miller
2013-12-13 6:08 ` Timo Teras
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2013-12-12 20:34 UTC (permalink / raw)
To: timo.teras; +Cc: netdev, pshelar
From: Timo Teräs <timo.teras@iki.fi>
Date: Thu, 12 Dec 2013 10:53:52 +0200
> ipgre_header_parse() needs to parse the tunnel's ip header for getting
> the link-layer addresses, and uses mac_header to get the header. This
> fixes setting mac_header on the receive path to original behaviour.
>
> Bug added in commit c54419321455 (GRE: Refactor GRE tunneling code.)
>
> Cc: Pravin B Shelar <pshelar@nicira.com>
> Signed-off-by: Timo Teräs <timo.teras@iki.fi>
> ---
> Alternate would be to do skb_reset_inner_headers() in ip_tunnel_rcv() and
> update ipgre_header_parse() to use skb_inner_network_header(). Though, then
> inner would then be referring to the "outer" headers.
>
> If applied as-is, should go to -stable too.
Would skb_reset_mac_header() work just as equally? I'd prefer that over
direct modification of skb->*_header values.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg
2013-12-12 20:34 ` David Miller
@ 2013-12-13 6:08 ` Timo Teras
2013-12-14 5:52 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Timo Teras @ 2013-12-13 6:08 UTC (permalink / raw)
To: David Miller; +Cc: netdev, pshelar
On Thu, 12 Dec 2013 15:34:29 -0500 (EST)
David Miller <davem@davemloft.net> wrote:
> From: Timo Teräs <timo.teras@iki.fi>
> Date: Thu, 12 Dec 2013 10:53:52 +0200
>
> > ipgre_header_parse() needs to parse the tunnel's ip header for
> > getting the link-layer addresses, and uses mac_header to get the
> > header. This fixes setting mac_header on the receive path to
> > original behaviour.
> >
> > Bug added in commit c54419321455 (GRE: Refactor GRE tunneling code.)
> >
> > Cc: Pravin B Shelar <pshelar@nicira.com>
> > Signed-off-by: Timo Teräs <timo.teras@iki.fi>
> > ---
> > Alternate would be to do skb_reset_inner_headers() in
> > ip_tunnel_rcv() and update ipgre_header_parse() to use
> > skb_inner_network_header(). Though, then inner would then be
> > referring to the "outer" headers.
> >
> > If applied as-is, should go to -stable too.
>
> Would skb_reset_mac_header() work just as equally? I'd prefer that
> over direct modification of skb->*_header values.
No. It was actually converted originally to skb_reset_mac_header() but
that led to problems. See commit 1d0691674764098304ae4c63c715f588.
When ipgre_rcv is entered, the outer iphdr has been already pulled,
thus head points to the GRE header. So skb_reset_mac_header() would
make it point at the GRE header instead of the desired outer IP header.
But I agree that it'd be better to use helpers. That's why I suggested
the skb_reset_inner_headers() as an alternative. But as it's slightly
more intrusive approach, I opted to just restore the original assignment
as first suggestion.
- Timo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg
2013-12-13 6:08 ` Timo Teras
@ 2013-12-14 5:52 ` David Miller
2013-12-16 9:02 ` [PATCH net,v2] " Timo Teräs
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2013-12-14 5:52 UTC (permalink / raw)
To: timo.teras; +Cc: netdev, pshelar
From: Timo Teras <timo.teras@iki.fi>
Date: Fri, 13 Dec 2013 08:08:44 +0200
> On Thu, 12 Dec 2013 15:34:29 -0500 (EST)
> David Miller <davem@davemloft.net> wrote:
>
>> From: Timo Teräs <timo.teras@iki.fi>
>> Date: Thu, 12 Dec 2013 10:53:52 +0200
>>
>> > ipgre_header_parse() needs to parse the tunnel's ip header for
>> > getting the link-layer addresses, and uses mac_header to get the
>> > header. This fixes setting mac_header on the receive path to
>> > original behaviour.
>> >
>> > Bug added in commit c54419321455 (GRE: Refactor GRE tunneling code.)
>> >
>> > Cc: Pravin B Shelar <pshelar@nicira.com>
>> > Signed-off-by: Timo Teräs <timo.teras@iki.fi>
>> > ---
>> > Alternate would be to do skb_reset_inner_headers() in
>> > ip_tunnel_rcv() and update ipgre_header_parse() to use
>> > skb_inner_network_header(). Though, then inner would then be
>> > referring to the "outer" headers.
>> >
>> > If applied as-is, should go to -stable too.
>>
>> Would skb_reset_mac_header() work just as equally? I'd prefer that
>> over direct modification of skb->*_header values.
>
> No. It was actually converted originally to skb_reset_mac_header() but
> that led to problems. See commit 1d0691674764098304ae4c63c715f588.
>
> When ipgre_rcv is entered, the outer iphdr has been already pulled,
> thus head points to the GRE header. So skb_reset_mac_header() would
> make it point at the GRE header instead of the desired outer IP header.
>
> But I agree that it'd be better to use helpers. That's why I suggested
> the skb_reset_inner_headers() as an alternative. But as it's slightly
> more intrusive approach, I opted to just restore the original assignment
> as first suggestion.
Just make a helper that does this mac_header = network_header thing,
call it something like "skb_pop_mac_header(skb)" and the make the ip_gre
code use it.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net,v2] ip_gre: fix msg_name parsing for recvfrom/recvmsg
2013-12-14 5:52 ` David Miller
@ 2013-12-16 9:02 ` Timo Teräs
2013-12-18 22:45 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Timo Teräs @ 2013-12-16 9:02 UTC (permalink / raw)
To: David Miller, netdev; +Cc: Timo Teräs, Pravin B Shelar
ipgre_header_parse() needs to parse the tunnel's ip header and it
uses mac_header to locate the iphdr. This got broken when gre tunneling
was refactored as mac_header is no longer updated to point to iphdr.
Introduce skb_pop_mac_header() helper to do the mac_header assignment
and use it in ipgre_rcv() to fix msg_name parsing.
Bug introduced in commit c54419321455 (GRE: Refactor GRE tunneling code.)
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
---
Updated as suggested. Please queue for -stable too.
include/linux/skbuff.h | 5 +++++
net/ipv4/ip_gre.c | 1 +
2 files changed, 6 insertions(+)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 77c7aae..8b38a2f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1638,6 +1638,11 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
skb->mac_header += offset;
}
+static inline void skb_pop_mac_header(struct sk_buff *skb)
+{
+ skb->mac_header = skb->network_header;
+}
+
static inline void skb_probe_transport_header(struct sk_buff *skb,
const int offset_hint)
{
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index d7aea4c..e560ef3 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -217,6 +217,7 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi)
iph->saddr, iph->daddr, tpi->key);
if (tunnel) {
+ skb_pop_mac_header(skb);
ip_tunnel_rcv(tunnel, skb, tpi, log_ecn_error);
return PACKET_RCVD;
}
--
1.8.5.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net,v2] ip_gre: fix msg_name parsing for recvfrom/recvmsg
2013-12-16 9:02 ` [PATCH net,v2] " Timo Teräs
@ 2013-12-18 22:45 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-12-18 22:45 UTC (permalink / raw)
To: timo.teras; +Cc: netdev, pshelar
From: Timo Teräs <timo.teras@iki.fi>
Date: Mon, 16 Dec 2013 11:02:09 +0200
> ipgre_header_parse() needs to parse the tunnel's ip header and it
> uses mac_header to locate the iphdr. This got broken when gre tunneling
> was refactored as mac_header is no longer updated to point to iphdr.
> Introduce skb_pop_mac_header() helper to do the mac_header assignment
> and use it in ipgre_rcv() to fix msg_name parsing.
>
> Bug introduced in commit c54419321455 (GRE: Refactor GRE tunneling code.)
>
> Cc: Pravin B Shelar <pshelar@nicira.com>
> Signed-off-by: Timo Teräs <timo.teras@iki.fi>
> ---
> Updated as suggested. Please queue for -stable too.
Applied and queued up for -stable, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-18 22:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-12 8:53 [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg Timo Teräs
2013-12-12 20:34 ` David Miller
2013-12-13 6:08 ` Timo Teras
2013-12-14 5:52 ` David Miller
2013-12-16 9:02 ` [PATCH net,v2] " Timo Teräs
2013-12-18 22:45 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).