Re: [4.9.10] ip_route_me_harder() reading off-slab

Path	csiph.com!aioe.org!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Daniel J Blueman <daniel@quora.org>
Newsgroups	linux.kernel
Subject	Re: [4.9.10] ip_route_me_harder() reading off-slab
Date	Sat, 18 Feb 2017 08:10:01 +0100
Message-ID	<tc7jz-7bL-3@gated-at.bofh.it> (permalink)
References	<tbIuR-7R1-3@gated-at.bofh.it> <tbJqV-8sz-5@gated-at.bofh.it>
X-Original-To	Eric Dumazet <eric.dumazet@gmail.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=quora.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=fQw0cqvvuoX4FJ5sjtwexOR6ISr4V1/QXWfnAwV6mrA=; b=G83WNXq49XwLhyutT3Emc9TvDNC5Eblc+0VECVLpI3GjcNQO3MWLKvconHub2cQtXv ACRcKOpjVybhVPChvM44TxeejFhROQKmyQFhlqqjrsQ4O6MeKfY56w66vYq6WQ2HwA8r FaUsrvK494s8XesYBxqqCc67UU9CgFwZ8EZOY=
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=fQw0cqvvuoX4FJ5sjtwexOR6ISr4V1/QXWfnAwV6mrA=; b=TA66ok3NR3mqrwTwIbeaqmST9yIsOHydQG0GjllsrqtmVmWbleS/vYq1JOX6woAnNc rv9O2fKzZyY8KVv8IQh02CNRGyoYUWqSveHc38dSZHQND/ATJEM92IWJ2Abzi9Zwwf3X MkJvJYBapKkHxia6d/4+vM3vxZuGj22MEgUXYoNW3o097mt+ZXUCCgMbZ0IbsxWj1nmI SYIsvVbN15dBP76+VEOJ6H0HC28ECwg6vSvuGHuKBYl5VYgnKaIlUnjYW02YVQDEqCMJ BQCR8uIRMpnyvoUV6UU2BBTZg7068givU7J8PCqldIRl6pQzSSRnIcQvN8wjo1W1GoM+ kHXA==
X-Gm-Message-State	AMke39nylvbXHL1csGGVYGnuLf3Z6/RDLBk1Q4xaA04aXcCNxLI/FUQ49eVZD/5zZpC+wvsy0AfO6kfoZyTp7Q==
X-Received	by 10.31.73.5 with SMTP id w5mr4853682vka.160.1487400973777; Fri, 17 Feb 2017 22:56:13 -0800 (PST)
MIME-Version	1.0
X-Originating-IP	[138.75.2.220]
Content-Type	text/plain; charset=UTF-8
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	54
Organization	linux.* mail to news gateway
X-Original-Cc	Linux Kernel <linux-kernel@vger.kernel.org>, "David S. Miller" <davem@davemloft.net>, "Eric W. Biederman" <ebiederm@xmission.com>, David Ahern <dsa@cumulusnetworks.com>, Jan Beulich <JBeulich@suse.com>, Netdev <netdev@vger.kernel.org>, Florian Westphal <fw@strlen.de>
X-Original-Date	Sat, 18 Feb 2017 14:56:13 +0800
X-Original-Message-ID	<CAMVG2sv5+4HsBD1nBiwAOHppB0ZWJ5Ojk2wQDTC_XLSmytQePA@mail.gmail.com>
X-Original-References	<CAMVG2sszgMW0C3LB-u4bqyMYFgnarXspn9iX0GF9+KMW0A0bJg@mail.gmail.com> <1487309781.1311.71.camel@edumazet-glaptop3.roam.corp.google.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1583854

Show key headers only | View raw

On 17 February 2017 at 13:36, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> On Fri, 2017-02-17 at 12:36 +0800, Daniel J Blueman wrote:
>> When booting a VM in libvirt/KVM attached to a local bridge and KASAN
>> enabled on 4.9.10, we see a stream of KASAN warnings about off-slab
>> access [1].
>>
>> Let me know if you'd like more debug.
>
> Could you try the following patch ?
>
> Thanks !
>
> diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
> index b3cc1335adbc1a20dcd225d0501b0a286d27e3c8..18839e59da849f0988924bcbc9873965a3681eb0 100644
> --- a/net/ipv4/netfilter.c
> +++ b/net/ipv4/netfilter.c
> @@ -23,7 +23,8 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t
>         struct rtable *rt;
>         struct flowi4 fl4 = {};
>         __be32 saddr = iph->saddr;
> -       __u8 flags = skb->sk ? inet_sk_flowi_flags(skb->sk) : 0;
> +       struct sock *sk = skb->sk;
> +       __u8 flags = sk && sk_fullsock(sk) ? inet_sk_flowi_flags(sk) : 0;
>         struct net_device *dev = skb_dst(skb)->dev;
>         unsigned int hh_len;
>
> @@ -40,7 +41,7 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t
>         fl4.daddr = iph->daddr;
>         fl4.saddr = saddr;
>         fl4.flowi4_tos = RT_TOS(iph->tos);
> -       fl4.flowi4_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0;
> +       fl4.flowi4_oif = sk ? sk->sk_bound_dev_if : 0;
>         if (!fl4.flowi4_oif)
>                 fl4.flowi4_oif = l3mdev_master_ifindex(dev);
>         fl4.flowi4_mark = skb->mark;
> @@ -61,7 +62,7 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t
>             xfrm_decode_session(skb, flowi4_to_flowi(&fl4), AF_INET) == 0) {
>                 struct dst_entry *dst = skb_dst(skb);
>                 skb_dst_set(skb, NULL);
> -               dst = xfrm_lookup(net, dst, flowi4_to_flowi(&fl4), skb->sk, 0);
> +               dst = xfrm_lookup(net, dst, flowi4_to_flowi(&fl4), sk, 0);
>                 if (IS_ERR(dst))
>                         return PTR_ERR(dst);
>                 skb_dst_set(skb, dst);

Fine work! This nicely resolves the issue. I'll test Florian's
proposed fix also.

Tested-by: Daniel J Blueman <daniel@quora.org>

Thanks,
  Dan
-- 
Daniel J Blueman

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[4.9.10] ip_route_me_harder() reading off-slab Daniel J Blueman <daniel@quora.org> - 2017-02-17 05:40 +0100
  Re: [4.9.10] ip_route_me_harder() reading off-slab Eric Dumazet <eric.dumazet@gmail.com> - 2017-02-17 06:40 +0100
    Re: [4.9.10] ip_route_me_harder() reading off-slab Daniel J Blueman <daniel@quora.org> - 2017-02-18 08:10 +0100

csiph-web