Message ID | 1418142520.14835.22.camel@edumazet-glaptop2.roam.corp.google.com |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
On Tue, Dec 9, 2014 at 9:28 AM, Eric Dumazet <eric.dumazet@gmail.com> wrote: > On Tue, 2014-12-09 at 08:18 -0800, Eric Dumazet wrote: >> On Tue, 2014-12-09 at 08:16 -0800, Eric Dumazet wrote: >> > On Tue, 2014-12-09 at 09:00 -0700, dann frazier wrote: >> > > I'm observing a very reproducible oops which I have bisected down to >> > > commit ca777ef: >> >> > >> > Following patch should have fixed this >> > >> > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c3658e8d0f10147fc86018be7f11668246c156d3 >> > >> >> Oh well, fix was not complete. I'll submit a followup patch. >> > > Could you try following fix before I send official patch ? This patch does appear to resolve the issue, thanks Eric! -dann > Thanks ! > > diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c > index 33f5ff068c7958515e0f63792883a58fb5d6a341..a3f72d7fc06c07c43e1c00b67970eaee074e4593 100644 > --- a/net/ipv4/tcp_ipv4.c > +++ b/net/ipv4/tcp_ipv4.c > @@ -623,6 +623,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) > arg.iov[0].iov_base = (unsigned char *)&rep; > arg.iov[0].iov_len = sizeof(rep.th); > > + net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev); > #ifdef CONFIG_TCP_MD5SIG > hash_location = tcp_parse_md5sig_option(th); > if (!sk && hash_location) { > @@ -633,7 +634,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) > * Incoming packet is checked with md5 hash with finding key, > * no RST generated if md5 hash doesn't match. > */ > - sk1 = __inet_lookup_listener(dev_net(skb_dst(skb)->dev), > + sk1 = __inet_lookup_listener(net, > &tcp_hashinfo, ip_hdr(skb)->saddr, > th->source, ip_hdr(skb)->daddr, > ntohs(th->source), inet_iif(skb)); > @@ -681,7 +682,6 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) > if (sk) > arg.bound_dev_if = sk->sk_bound_dev_if; > > - net = dev_net(skb_dst(skb)->dev); > arg.tos = ip_hdr(skb)->tos; > ip_send_unicast_reply(net, skb, &TCP_SKB_CB(skb)->header.h4.opt, > ip_hdr(skb)->saddr, ip_hdr(skb)->daddr, > > -- 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
On Tue, 2014-12-09 at 10:10 -0700, Dann Frazier wrote:
> This patch does appear to resolve the issue, thanks Eric!
Thanks Dann
I need to cook a proper patch including ipv6 changes.
--
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
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 33f5ff068c7958515e0f63792883a58fb5d6a341..a3f72d7fc06c07c43e1c00b67970eaee074e4593 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -623,6 +623,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) arg.iov[0].iov_base = (unsigned char *)&rep; arg.iov[0].iov_len = sizeof(rep.th); + net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev); #ifdef CONFIG_TCP_MD5SIG hash_location = tcp_parse_md5sig_option(th); if (!sk && hash_location) { @@ -633,7 +634,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) * Incoming packet is checked with md5 hash with finding key, * no RST generated if md5 hash doesn't match. */ - sk1 = __inet_lookup_listener(dev_net(skb_dst(skb)->dev), + sk1 = __inet_lookup_listener(net, &tcp_hashinfo, ip_hdr(skb)->saddr, th->source, ip_hdr(skb)->daddr, ntohs(th->source), inet_iif(skb)); @@ -681,7 +682,6 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) if (sk) arg.bound_dev_if = sk->sk_bound_dev_if; - net = dev_net(skb_dst(skb)->dev); arg.tos = ip_hdr(skb)->tos; ip_send_unicast_reply(net, skb, &TCP_SKB_CB(skb)->header.h4.opt, ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,