Patchwork [net-next] tcp: tcp_v4_early_demux() fixes

login
register
mail settings
Submitter Eric Dumazet
Date July 24, 2012, 10:42 a.m.
Message ID <1343126555.2626.11053.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/172821/
State Superseded
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - July 24, 2012, 10:42 a.m.
From: Eric Dumazet <edumazet@google.com>

1) Remove a non needed pskb_may_pull() and fix a potential bug
if skb->head was reallocated (iph & th pointers were not reloaded)

TCP stack will pull/check headers anyway.

2) skb->dev->ifindex can be now replaced by skb->skb_iif

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/ipv4/tcp_ipv4.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Dumazet - July 24, 2012, 11:05 a.m.
On Tue, 2012-07-24 at 12:42 +0200, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
> 
> 1) Remove a non needed pskb_may_pull() and fix a potential bug
> if skb->head was reallocated (iph & th pointers were not reloaded)
> 
> TCP stack will pull/check headers anyway.
> 
> 2) skb->dev->ifindex can be now replaced by skb->skb_iif
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> ---
>  net/ipv4/tcp_ipv4.c |    9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

I'll send a v2, a fix is also needed in ip_rcv_finish()


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 3e30548..b6b07c9 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1686,7 +1686,6 @@  void tcp_v4_early_demux(struct sk_buff *skb)
 	struct net *net = dev_net(skb->dev);
 	const struct iphdr *iph;
 	const struct tcphdr *th;
-	struct net_device *dev;
 	struct sock *sk;
 
 	if (skb->pkt_type != PACKET_HOST)
@@ -1701,14 +1700,10 @@  void tcp_v4_early_demux(struct sk_buff *skb)
 	if (th->doff < sizeof(struct tcphdr) / 4)
 		return;
 
-	if (!pskb_may_pull(skb, ip_hdrlen(skb) + th->doff * 4))
-		return;
-
-	dev = skb->dev;
 	sk = __inet_lookup_established(net, &tcp_hashinfo,
 				       iph->saddr, th->source,
 				       iph->daddr, ntohs(th->dest),
-				       dev->ifindex);
+				       skb->skb_iif);
 	if (sk) {
 		skb->sk = sk;
 		skb->destructor = sock_edemux;
@@ -1718,7 +1713,7 @@  void tcp_v4_early_demux(struct sk_buff *skb)
 			if (dst)
 				dst = dst_check(dst, 0);
 			if (dst &&
-			    icsk->rx_dst_ifindex == dev->ifindex)
+			    icsk->rx_dst_ifindex == skb->skb_iif)
 				skb_dst_set_noref(skb, dst);
 		}
 	}