From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 018DFC10F13 for ; Mon, 15 Apr 2019 00:38:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEF362084E for ; Mon, 15 Apr 2019 00:38:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P1Eh5wV2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726233AbfDOAi3 (ORCPT ); Sun, 14 Apr 2019 20:38:29 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:36083 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725775AbfDOAi3 (ORCPT ); Sun, 14 Apr 2019 20:38:29 -0400 Received: by mail-io1-f67.google.com with SMTP id f6so13190657iop.3 for ; Sun, 14 Apr 2019 17:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=K2SgW2gFZM6O+Vv6Zy89I3EB8ls6S1Y7ZVh+HI2MvYA=; b=P1Eh5wV2BXG10bcek5aOJ2BYsS6448ppASsvURd1LGzycg9bGKLeMuP2EXzEXHXfEV jJ0Hde/LT2x7DwFew+0df5bRV9MelmxUslxeNWxhsPWAM3R1Tum/+zE1vUsG7WnL4zaJ U27qRxlWrYWbreZ4EbZw4Lr3QvVr6adEfxkJu9KAxko2gTynCg0uD+3NU5sswih73G2n NnXZDKNAAHZEtkKJr5DVcqRIpBzrv7Ef1hLOeVq5kr5m3rp8Os4fGWhs6aDoNysUAqWx KuOxiyk2Qs4fyicQtnUscxJXGAedbAHfIqly9HFyiam64zSk37bb5lDfRn+WcV7ktA27 LLMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=K2SgW2gFZM6O+Vv6Zy89I3EB8ls6S1Y7ZVh+HI2MvYA=; b=Iz3Mt+n5rk3K9xxCjqLBsZeG7kJoXzpJ7i1xu94gPV9r4JpT/5PGKYSSdKbMg419nd czgwqs7ZEEy101HDFHNlRkxcaIFpJpbQOEdVIkJVscoOuScy8mJJV7dm+8NsedqzrKIC Wt4pJfOGESJWiyPeEaSyrytayLRxDylr8v0p0wZZwEqLO0MAY9tKrJgMxZBMXMbGp0KY erwIHkCakClwTzI2s3BjSVTTTBhBMD3dBU1GCr73eSV3sr4yj6QkbKSG9rt7SGcnxZ69 oyF49nyxkbZw+p5jiiB+NM9d5fx/zkrNBzJarcTCSsOrp9475Mrxmhf3tMHcQL5uRO6B T0lw== X-Gm-Message-State: APjAAAXXNWGZmXfshenQoRS5ooD6CovFKU57Hyz1eAbMCPE/w3Y8yw5/ EZlF53yms8mIyMvttZk1su4= X-Google-Smtp-Source: APXvYqzV4Q3I16/jZHtRA28/levpGWZ41V9SrbPvuH3itEr2OzeikRujX6ys5Sn0SBXFzvGY1mP/iQ== X-Received: by 2002:a5e:830c:: with SMTP id x12mr12167683iom.224.1555288708585; Sun, 14 Apr 2019 17:38:28 -0700 (PDT) Received: from ?IPv6:2601:282:800:fd80:95f1:4312:6b29:96d6? ([2601:282:800:fd80:95f1:4312:6b29:96d6]) by smtp.googlemail.com with ESMTPSA id k18sm18335897iob.60.2019.04.14.17.38.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Apr 2019 17:38:27 -0700 (PDT) Subject: Re: [PATCH net] route: Avoid crash from dereferencing NULL rt->from To: Jonathan Lemon , netdev@vger.kernel.org Cc: kernel-team@fb.com References: <20190414212129.2306318-1-jonathan.lemon@gmail.com> From: David Ahern Message-ID: Date: Sun, 14 Apr 2019 18:38:26 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190414212129.2306318-1-jonathan.lemon@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 4/14/19 3:21 PM, Jonathan Lemon wrote: > When __ip6_rt_update_pmtu() is called, rt->from is RCU dereferenced, but is > never checked for null - rt6_flush_exceptions() may have removed the entry. > > [ 1913.989004] RIP: 0010:ip6_rt_cache_alloc+0x13/0x170 > [ 1914.209410] Call Trace: > [ 1914.214798] > [ 1914.219226] __ip6_rt_update_pmtu+0xb0/0x190 > [ 1914.228649] ip6_tnl_xmit+0x2c2/0x970 [ip6_tunnel] > [ 1914.239223] ? ip6_tnl_parse_tlv_enc_lim+0x32/0x1a0 [ip6_tunnel] > [ 1914.252489] ? __gre6_xmit+0x148/0x530 [ip6_gre] > [ 1914.262678] ip6gre_tunnel_xmit+0x17e/0x3c7 [ip6_gre] > [ 1914.273831] dev_hard_start_xmit+0x8d/0x1f0 > [ 1914.283061] sch_direct_xmit+0xfa/0x230 > [ 1914.291521] __qdisc_run+0x154/0x4b0 > [ 1914.299407] net_tx_action+0x10e/0x1f0 > [ 1914.307678] __do_softirq+0xca/0x297 > [ 1914.315567] irq_exit+0x96/0xa0 > [ 1914.322494] smp_apic_timer_interrupt+0x68/0x130 > [ 1914.332683] apic_timer_interrupt+0xf/0x20 > [ 1914.341721] > > Signed-off-by: Jonathan Lemon > --- > net/ipv6/route.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index d555edaaff13..b9cbe6815f2c 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -2331,6 +2331,10 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk, > > rcu_read_lock(); > from = rcu_dereference(rt6->from); > + if (!from) { > + rcu_read_unlock(); > + return; > + } > nrt6 = ip6_rt_cache_alloc(from, daddr, saddr); > if (nrt6) { > rt6_do_update_pmtu(nrt6, mtu); > Thanks for the fix. Reviewed-by: David Ahern