Fwd: Possible bug in net/ipv4/route.c?
in [Kernel]
|
Prev: fujitsu-laptop: remove unnecessary input_free_device calls
Next: [PATCH] tracing: Allow to disable cmdline recording
From: YOSHIFUJI Hideaki on 1 Jul 2010 23:00 Switch to netdev. --yoshfuji -------- Original Message -------- Subject: Possible bug in net/ipv4/route.c? Date: Thu, 1 Jul 2010 16:00:29 -0700 From: Sol Kavy <skavy(a)ubicom.com> To: <linux-kernel(a)vger.kernel.org> CC: Greg Ren <gren(a)ubicom.com>, Guojun Jin <gjin(a)ubicom.com>, Murat Sezgin <msezgin(a)ubicom.com>, Sener Ilgen <silgen(a)ubicom.com> Found Linux: 2.6.28 Arch: Ubicom32 <not yet pushed> Project: uCLinux based Router Test: Bit torrent Stress Test Note: The top of Linus git net/ipv4/route.c appears to have the same issue. The following is a patch for clearing out IP options area in an input skb during link failure processing. Without this patch, the icmp_send() can result in a call to ip_options_echo() where the common buffer area of the skb is incorrectly interpreted. Depending on the previous use of the skb->cb[], the interpreted option length values can cause stack corruption by copying more than 40 bytes to the output options. In our case, a driver is using the skb->cb[] area to hold driver specific data. The driver is not zeroing out the area after use. I can see three basic solutions: 1) Drivers are not allowed to use the skb->cb[] area at all. Ubicom should modify the driver to use a different approach. 2) The layer using skb->cb[] should clear this area after use and before handing the skb to another layer. Ubicom should modify the driver to clear the skb->cb[] area before sending it up the line. 3) Any layer that "uses" the skb->cb[] area must clear the area before use. In which case, the proposed patch would fix the problem for the ipv4_link_failure(). I believe that this is the correct fix because I see ip_rcv() clears the skb->cb[] before using it. Can someone confirm that this is the appropriate fix? If this is documented somewhere, please direct me to the documentation. Please send email to sol(a)ubicom.com in addition to posting your response. Thanks, Sol Kavy/Murat Sezgin Ubicom, Inc. Patch: diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 125ee64..d13805f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1606,6 +1606,14 @@ static void ipv4_link_failure(struct sk_buff *skb) { struct rtable *rt; + /* + * Since link failure can be called with skbs from many layers (see arp) + * the cb area of the skb must be cleared before use. Because the cb area + * can be formatted according to the caller layer's cb area format and it may cause + * corruptions when it is handled in a different network layer. + */ + memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0); rt = skb->rtable; The packet is enqueud by: do_IRQ()->do_softirq()->__do_softirq()->net_rx_action()->ubi32_eth_napi_poll()->ubi32_eth_receive()->__vlan_hwaccel_rx()->netif_receive_skb()->br_handle_frame()->nf_hook_slow()->br_nf_pre_routing_finish()->br_nfr_pre_routing_finish_bridge()->neight_resolve_output()->__neigh_event_send(). The packet is then dequeued by: do_IRQ() -> irq_exit() -> do_softirq() -> run_timer_softirq() -> neigh_timer_handler() -> arp_error_report() -> ipv4_link_failure() -> icmp_send() -> ip_options_echo(). Because the Ubicom Ethernet driver overwrites the common buffer area, the enqueued packet contains garbage when casted as an IP options data structure. This results in ip_options_echo() miss reading the option length information and overwriting memory. By clearing the skb->cb[] before processing the icmp_send() against the packet, we ensure that ip_options_echo() does not corrupt memory. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Eric Dumazet on 2 Jul 2010 01:50 Le vendredi 02 juillet 2010 à 11:49 +0900, YOSHIFUJI Hideaki a écrit : > Switch to netdev. > thanks ;) > --yoshfuji > > -------- Original Message -------- > Subject: Possible bug in net/ipv4/route.c? > Date: Thu, 1 Jul 2010 16:00:29 -0700 > From: Sol Kavy <skavy(a)ubicom.com> > To: <linux-kernel(a)vger.kernel.org> > CC: Greg Ren <gren(a)ubicom.com>, Guojun Jin <gjin(a)ubicom.com>, Murat Sezgin <msezgin(a)ubicom.com>, Sener Ilgen <silgen(a)ubicom.com> > > Found Linux: 2.6.28 > Arch: Ubicom32 <not yet pushed> > Project: uCLinux based Router > Test: Bit torrent Stress Test > > Note: The top of Linus git net/ipv4/route.c appears to have the same issue. > Please use < 72 char lines > The following is a patch for clearing out IP options area in an input > skb during link failure processing. Without this patch, the > icmp_send() can result in a call to ip_options_echo() where the > common buffer area of the skb is incorrectly interpreted. Depending on the previous use of the skb->cb[], the interpreted option length values can cause stack corruption by copying more than 40 bytes to the output options. > > In our case, a driver is using the skb->cb[] area to hold driver > specific data. The driver is not zeroing out the area after use. I > can see three basic solutions: > > 1) Drivers are not allowed to use the skb->cb[] area at all. Ubicom > should modify the driver to use a different approach. > > 2) The layer using skb->cb[] should clear this area after use and > before handing the skb to another layer. Ubicom should modify the > driver to clear the skb->cb[] area before sending it up the line. > This is the right option. If you use one word in cb[], only your driver knows how to clear it efficiently. > 3) Any layer that "uses" the skb->cb[] area must clear the area before > use. In which case, the proposed patch would fix the problem for the > ipv4_link_failure(). I believe that this is the correct fix because I > see ip_rcv() clears the skb->cb[] before using it. > No : ip_rcv clears() skb->cb when leaving ip_rcv, not entering. skb allocation clears whole cb[], and each layer is responsible to clear the part it eventually dirtied. > Can someone confirm that this is the appropriate fix? If this is > documented somewhere, please direct me to the documentation. > > Please send email to sol(a)ubicom.com in addition to posting your > response. > > Thanks, > > Sol Kavy/Murat Sezgin > Ubicom, Inc. > > Patch: > > diff --git a/net/ipv4/route.c b/net/ipv4/route.c > index 125ee64..d13805f 100644 > --- a/net/ipv4/route.c > +++ b/net/ipv4/route.c > @@ -1606,6 +1606,14 @@ static void ipv4_link_failure(struct sk_buff *skb) > { > struct rtable *rt; > > + /* > + * Since link failure can be called with skbs from many layers (see arp) > + * the cb area of the skb must be cleared before use. Because the cb area > + * can be formatted according to the caller layer's cb area format and it may cause > + * corruptions when it is handled in a different network layer. > + */ > + memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); > icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0); > rt = skb->rtable; > > The packet is enqueud by: > do_IRQ()->do_softirq()->__do_softirq()->net_rx_action()->ubi32_eth_napi_poll()->ubi32_eth_receive()->__vlan_hwaccel_rx()->netif_receive_skb()->br_handle_frame()->nf_hook_slow()->br_nf_pre_routing_finish()->br_nfr_pre_routing_finish_bridge()->neight_resolve_output()->__neigh_event_send(). > > The packet is then dequeued by: > do_IRQ() -> irq_exit() -> do_softirq() -> run_timer_softirq() -> neigh_timer_handler() -> arp_error_report() -> ipv4_link_failure() -> icmp_send() -> ip_options_echo(). > > Because the Ubicom Ethernet driver overwrites the common buffer area, the enqueued packet contains garbage when casted as an IP options data structure. This results in ip_options_echo() miss reading the option length information and overwriting memory. By clearing the skb->cb[] before processing the icmp_send() against the packet, we ensure that ip_options_echo() does not corrupt memory. > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Herbert Xu on 5 Jul 2010 08:10 Eric Dumazet <eric.dumazet(a)gmail.com> wrote: > >> 2) The layer using skb->cb[] should clear this area after use and >> before handing the skb to another layer. Ubicom should modify the >> driver to clear the skb->cb[] area before sending it up the line. >> > > This is the right option. If you use one word in cb[], only your driver > knows how to clear it efficiently. Absolutely not! No protocol stack should rely on an external skb having a zero cb. Please fix the bridge instead as it's doing the IP injection. Cheers, -- Email: Herbert Xu <herbert(a)gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Herbert Xu on 5 Jul 2010 09:30 On Mon, Jul 05, 2010 at 02:59:14PM +0200, Eric Dumazet wrote: > > Why do we clear full 48 bytes skb->cb[] in skb_alloc(), if no protocol > stack should rely it being zero ? Unless a protocol is allocating the skb itself, then the fact that skb_alloc clears skb->cb is no guarantee that the skb->cb will be zero. Thanks, -- Email: Herbert Xu <herbert(a)gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Eric Dumazet on 5 Jul 2010 09:40
Le lundi 05 juillet 2010 à 20:06 +0800, Herbert Xu a écrit : > Eric Dumazet <eric.dumazet(a)gmail.com> wrote: > > > >> 2) The layer using skb->cb[] should clear this area after use and > >> before handing the skb to another layer. Ubicom should modify the > >> driver to clear the skb->cb[] area before sending it up the line. > >> > > > > This is the right option. If you use one word in cb[], only your driver > > knows how to clear it efficiently. > > Absolutely not! No protocol stack should rely on an external skb > having a zero cb. > Why do we clear full 48 bytes skb->cb[] in skb_alloc(), if no protocol stack should rely it being zero ? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |