| Message ID | 1353360858.10798.86.camel@edumazet-glaptop |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Nov 19, 2012 at 01:34:18PM -0800, Eric Dumazet wrote: > From: Eric Dumazet <edumazet@google.com> > > > Thanks for the report. > > > > I believe this is a regression of commit > > 35ad9b9cf7d8a2e6259a0d24022e910adb6f3489 > > (ipv6: Add helper inet6_csk_update_pmtu().) > > > > I'll prepare a patch to fix this. > > Please try the following fix. > > Thanks ! Ok, I'm running it. Let's see if it crashes today. Thank you! -- 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
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Mon, 19 Nov 2012 13:34:18 -0800 > [PATCH] ipv6: fix inet6_csk_update_pmtu() return value > > In case of error, inet6_csk_update_pmtu() should consistently > return NULL. > > Bug added in commit 35ad9b9cf7d8a > (ipv6: Add helper inet6_csk_update_pmtu().) > > Reported-by: Lluís Batlle i Rossell <viric@viric.name> > Signed-off-by: Eric Dumazet <edumazet@google.com> My bad. Applied and queued up for 3.6.x-stable, thanks! -- 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, Nov 20, 2012 at 03:18:45PM -0500, David Miller wrote: > From: Eric Dumazet <eric.dumazet@gmail.com> > Date: Mon, 19 Nov 2012 13:34:18 -0800 > > > [PATCH] ipv6: fix inet6_csk_update_pmtu() return value > > > > In case of error, inet6_csk_update_pmtu() should consistently > > return NULL. > > > > Bug added in commit 35ad9b9cf7d8a > > (ipv6: Add helper inet6_csk_update_pmtu().) > > > > Reported-by: Lluís Batlle i Rossell <viric@viric.name> > > Signed-off-by: Eric Dumazet <edumazet@google.com> > > My bad. Applied and queued up for 3.6.x-stable, thanks! All OK so far. No hang. Thank you all! -- 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/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index c4f9341..3064785 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c @@ -252,6 +252,7 @@ struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu) return NULL; dst->ops->update_pmtu(dst, sk, NULL, mtu); - return inet6_csk_route_socket(sk, &fl6); + dst = inet6_csk_route_socket(sk, &fl6); + return IS_ERR(dst) ? NULL : dst; } EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu);