Message ID | 20200925124726.028001941@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=ikAt=DC=vger.kernel.org=stable-owner@kernel.org> 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=-10.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 3292AC4727D for <stable@archiver.kernel.org>; Fri, 25 Sep 2020 12:51:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0292A22B2D for <stable@archiver.kernel.org>; Fri, 25 Sep 2020 12:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038296; bh=ud6Ce1H5+gJM28laOw/9a2IniJR3pJEU8ohEEPgkZF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ixfNAzQJ5tiHo/rByIH0mUtymEIZQ6UgK1JxiH6Ir31aOoMD+HkX4bBvwGEOhMwdS mvZ2pjTVhUV/DVzaMbglZx5+og6hModXhGZ7NnmkSetIRv7aInzWqk7lZ8i570knvb xGz5LY2Xs/GE2WZNJ1beaUXZP3x7TUhQLDMinbLs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729212AbgIYMvf (ORCPT <rfc822;stable@archiver.kernel.org>); Fri, 25 Sep 2020 08:51:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:55890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728759AbgIYMvc (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 25 Sep 2020 08:51:32 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C87272075E; Fri, 25 Sep 2020 12:51:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038291; bh=ud6Ce1H5+gJM28laOw/9a2IniJR3pJEU8ohEEPgkZF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vfFMX6g8fxoSFO+0YKdabzILna0Kr6TJu247ol0esJhyG/mvCawqKtvVYLmi949yp bshEuxCIr9Fom8nAaeQDcDgwZ3Lv6DVOrUY6WYkznncCIZOmKlaiJlA7hmZI9091Ju mMz270PgM+6IpCga5yLEfNWi+Kt5kAvkmIZsPP+8= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Eric Dumazet <edumazet@google.com>, David Ahern <dsahern@gmail.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.4 16/43] ipv6: avoid lockdep issue in fib6_del() Date: Fri, 25 Sep 2020 14:48:28 +0200 Message-Id: <20200925124726.028001941@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925124723.575329814@linuxfoundation.org> References: <20200925124723.575329814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1896,14 +1896,19 @@ static void fib6_del_route(struct fib6_t /* Need to own table->tb6_lock */ int fib6_del(struct fib6_info *rt, struct nl_info *info) { - struct fib6_node *fn = rcu_dereference_protected(rt->fib6_node, - lockdep_is_held(&rt->fib6_table->tb6_lock)); - struct fib6_table *table = rt->fib6_table; struct net *net = info->nl_net; struct fib6_info __rcu **rtp; struct fib6_info __rcu **rtp_next; + struct fib6_table *table; + struct fib6_node *fn; - if (!fn || rt == net->ipv6.fib6_null_entry) + if (rt == net->ipv6.fib6_null_entry) + return -ENOENT; + + table = rt->fib6_table; + fn = rcu_dereference_protected(rt->fib6_node, + lockdep_is_held(&table->tb6_lock)); + if (!fn) return -ENOENT; WARN_ON(!(fn->fn_flags & RTN_RTINFO));