From patchwork Fri Mar 20 02:54:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 1258607 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lca.pw header.i=@lca.pw header.a=rsa-sha256 header.s=google header.b=diAsWuOE; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48k7fZ5HMTz9sSL for ; Fri, 20 Mar 2020 13:54:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726697AbgCTCyk (ORCPT ); Thu, 19 Mar 2020 22:54:40 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:38341 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726103AbgCTCyj (ORCPT ); Thu, 19 Mar 2020 22:54:39 -0400 Received: by mail-qt1-f194.google.com with SMTP id z12so3833611qtq.5 for ; Thu, 19 Mar 2020 19:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S0/mrn3rzQVBFkzod99RMOB6yGI2xYesLtS40pF0HvY=; b=diAsWuOEtzlsKfOfRgUcqOHG9kn8IIUQ6GQqF8gnYrOKQRTXGdVkzcvLdnb5mgmo+4 /X/ORHQp4Wz8u0/toRiVzhuXNnzl3/fesQFew+4uvHL9Isb6kXxlknmsDA6jcY7cIrpv eZqOIirMmeHDxFoEWKpHgdeLcdo3Ot65ukMeoL57m0C8lnOZBdY3GLv4udgjG67LRrVv t50GUSgH70zQOzANRFozgT4NPYOs2YNj1O+nfSgKrQsGbCW9B1at/ZQnoEjRa9AT+7xD +N40PE9h7FikJxiJa3orhUDsxZw7r3uzLe0/XhbRbe2es5Vkf27tgNppZ+g9XL0Kblf3 6JCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S0/mrn3rzQVBFkzod99RMOB6yGI2xYesLtS40pF0HvY=; b=ZighjDNKbaT1HKg42ZV581RuU4C8S6dZN9I7JKusmlz6pq7ESzWb7RhzFlvKCjZv3F NivhHnqHBAY3aH5B3P7BVwthAiIGWmnlewB4uNkIb8m++Ciw1ehWd+RyJQnVEEJxeiKe 2UTEJvYqtL1BJTgHS5OUKd6cNjWKTddizz5FK+INJPm0Ijzv/r06i+3D4mf2snBzcUvK aOmv7oa/QrFY/EGgPzkzXkTubRFlt8EAgEirORVNdqaktlrPqvoSN2MteV4hWbQcWTq4 75GP0mq5bkZN+FXIG9tMXuh9I7ZHmnBW+dDmHdNztLlPYfraYiKLOHb8SZQH2nSx32kJ c9/w== X-Gm-Message-State: ANhLgQ30M1wZGvYdnOBAzs2Hsuej7AEXGPm1eRe9LXR/nV9DvS0Ncfjn p6ISZ83zOPWRB685GJNd7iRdbA== X-Google-Smtp-Source: ADFU+vvXJKh1T/KUuUPCH/VMXxunSSn2oqq4GnaqzV1YA7XZi4u4vl3hefMLbEGpHGQBNlgio/39sQ== X-Received: by 2002:ac8:2d88:: with SMTP id p8mr3126608qta.346.1584672878551; Thu, 19 Mar 2020 19:54:38 -0700 (PDT) Received: from ovpn-66-200.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id 16sm3134342qkk.79.2020.03.19.19.54.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2020 19:54:38 -0700 (PDT) From: Qian Cai To: davem@davemloft.net Cc: alexander.h.duyck@linux.intel.com, kuznet@ms2.inr.ac.ru, kuba@kernel.org, yoshfuji@linux-ipv6.org, dsahern@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib() Date: Thu, 19 Mar 2020 22:54:21 -0400 Message-Id: <20200320025421.9216-1-cai@lca.pw> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a place, inet_dump_fib() fib_table_dump fn_trie_dump_leaf() hlist_for_each_entry_rcu() without rcu_read_lock() will trigger a warning, WARNING: suspicious RCU usage ----------------------------- net/ipv4/fib_trie.c:2216 RCU-list traversed in non-reader section!! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 1 lock held by ip/1923: #0: ffffffff8ce76e40 (rtnl_mutex){+.+.}, at: netlink_dump+0xd6/0x840 Call Trace: dump_stack+0xa1/0xea lockdep_rcu_suspicious+0x103/0x10d fn_trie_dump_leaf+0x581/0x590 fib_table_dump+0x15f/0x220 inet_dump_fib+0x4ad/0x5d0 netlink_dump+0x350/0x840 __netlink_dump_start+0x315/0x3e0 rtnetlink_rcv_msg+0x4d1/0x720 netlink_rcv_skb+0xf0/0x220 rtnetlink_rcv+0x15/0x20 netlink_unicast+0x306/0x460 netlink_sendmsg+0x44b/0x770 __sys_sendto+0x259/0x270 __x64_sys_sendto+0x80/0xa0 do_syscall_64+0x69/0xf4 entry_SYSCALL_64_after_hwframe+0x49/0xb3 Fixes: 18a8021a7be3 ("net/ipv4: Plumb support for filtering route dumps") Signed-off-by: Qian Cai Reviewed-by: David Ahern --- v2: Call rcu_read_unlock() before returning. Add a "Fixes" tag per David. net/ipv4/fib_frontend.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 577db1d50a24..213be9c050ad 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -997,7 +997,9 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) return -ENOENT; } + rcu_read_lock(); err = fib_table_dump(tb, skb, cb, &filter); + rcu_read_unlock(); return skb->len ? : err; }