On Thu, Feb 18, 2021 at 3:39 PM Jason A. Donenfeld <ja...@zx2c4.com> wrote:
>
> The icmp{,v6}_send functions make all sorts of use of skb->cb, casting
Again, if respinning, please briefly describe the specific buggy code
path. I think it's informative and cannot be gleaned from the fix.
> it with IPCB or IP6CB, assuming the skb to have come directly from the
> inet layer. But when the packet comes from the ndo layer, especially
> when forwarded, there's no telling what might be in skb->cb at that
> point. As a result, the icmp sending code risks reading bogus memory
> contents, which can result in nasty stack overflows such as this one
> reported by a user:
>
> panic+0x108/0x2ea
> __stack_chk_fail+0x14/0x20
> __icmp_send+0x5bd/0x5c0
> icmp_ndo_send+0x148/0x160
>
> This is easy to simulate by doing a `memset(skb->cb, 0x41,
> sizeof(skb->cb));` before calling icmp{,v6}_ndo_send, and it's only by
> good fortune and the rarity of icmp sending from that context that we've
> avoided reports like this until now. For example, in KASAN:
>
> BUG: KASAN: stack-out-of-bounds in __ip_options_echo+0xa0e/0x12b0
> Write of size 38 at addr ffff888006f1f80e by task ping/89
> CPU: 2 PID: 89 Comm: ping Not tainted 5.10.0-rc7-debug+ #5
> Call Trace:
> dump_stack+0x9a/0xcc
> print_address_description.constprop.0+0x1a/0x160
> __kasan_report.cold+0x20/0x38
> kasan_report+0x32/0x40
> check_memory_region+0x145/0x1a0
> memcpy+0x39/0x60
> __ip_options_echo+0xa0e/0x12b0
> __icmp_send+0x744/0x1700
>
> Actually, out of the 4 drivers that do this, only gtp zeroed the cb for
> the v4 case, while the rest did not. So this commit actually removes the
> gtp-specific zeroing, while putting the code where it belongs in the
> shared infrastructure of icmp{,v6}_ndo_send.
>
> This commit fixes the issue by passing an empty IPCB or IP6CB along to
> the functions that actually do the work. For the icmp_send, this was
> already trivial, thanks to __icmp_send providing the plumbing function.
> For icmpv6_send, this required a tiny bit of refactoring to make it
> behave like the v4 case, after which it was straight forward.
>
> Fixes: a2b78e9b2cac ("sunvnet: generate ICMP PTMUD messages for smaller port
> MTUs")
> Reported-by: SinYu <liux...@gmail.com>
> Cc: Willem de Bruijn <will...@google.com>
> Link:
> https://lore.kernel.org/netdev/CAF=yd-lof116ahub6rme8vb8zpnrrnotdqhobex+bvoa8as...@mail.gmail.com/T/
> Signed-off-by: Jason A. Donenfeld <ja...@zx2c4.com>
> ---
> -#define icmpv6_ndo_send icmpv6_send
> +static inline void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code,
> __u32 info)
> +{
> + struct inet6_skb_parm parm = { 0 };
> + __icmpv6_send(skb_in, type, code, info, &parm);
> +}
> #endif
> -void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
> +void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,
> + const struct inet6_skb_parm *parm)
> {
> ip6_icmp_send_t *send;
>
> rcu_read_lock();
> send = rcu_dereference(ip6_icmp_send);
> if (send)
> - send(skb, type, code, info, NULL);
> + send(skb, type, code, info, NULL, IP6CB(skb));
This should be parm.
> #if IS_ENABLED(CONFIG_NF_NAT)
> #include <net/netfilter/nf_conntrack.h>
> void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info)
> {
> + struct inet6_skb_parm parm = { 0 };
> struct sk_buff *cloned_skb = NULL;
> enum ip_conntrack_info ctinfo;
> struct in6_addr orig_ip;
> @@ -57,7 +59,7 @@ void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8
> code, __u32 info)
>
> ct = nf_ct_get(skb_in, &ctinfo);
> if (!ct || !(ct->status & IPS_SRC_NAT)) {
> - icmpv6_send(skb_in, type, code, info);
> + __icmpv6_send(skb_in, type, code, info, &parm);
> return;
> }
>
> @@ -72,7 +74,7 @@ void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8
> code, __u32 info)
>
> orig_ip = ipv6_hdr(skb_in)->saddr;
> ipv6_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.in6;
> - icmpv6_send(skb_in, type, code, info);
> + __icmpv6_send(skb_in, type, code, info, &parm);
> ipv6_hdr(skb_in)->saddr = orig_ip;
> out:
> consume_skb(cloned_skb);
> --
> 2.30.1
>
