* [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib()
@ 2020-03-20 2:54 Qian Cai
2020-03-20 15:23 ` David Ahern
2020-03-24 4:00 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Qian Cai @ 2020-03-20 2:54 UTC (permalink / raw)
To: davem
Cc: alexander.h.duyck, kuznet, kuba, yoshfuji, dsahern, netdev,
linux-kernel, Qian Cai
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 <cai@lca.pw>
---
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;
}
--
2.21.0 (Apple Git-122.2)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib()
2020-03-20 2:54 [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib() Qian Cai
@ 2020-03-20 15:23 ` David Ahern
2020-03-24 4:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Ahern @ 2020-03-20 15:23 UTC (permalink / raw)
To: Qian Cai, davem
Cc: alexander.h.duyck, kuznet, kuba, yoshfuji, netdev, linux-kernel
On 3/19/20 8:54 PM, Qian Cai wrote:
> 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 <cai@lca.pw>
> ---
>
> 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;
> }
>
>
Reviewed-by: David Ahern <dsahern@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib()
2020-03-20 2:54 [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib() Qian Cai
2020-03-20 15:23 ` David Ahern
@ 2020-03-24 4:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-03-24 4:00 UTC (permalink / raw)
To: cai
Cc: alexander.h.duyck, kuznet, kuba, yoshfuji, dsahern, netdev, linux-kernel
From: Qian Cai <cai@lca.pw>
Date: Thu, 19 Mar 2020 22:54:21 -0400
> 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
...
> Fixes: 18a8021a7be3 ("net/ipv4: Plumb support for filtering route dumps")
> Signed-off-by: Qian Cai <cai@lca.pw>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-24 4:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-20 2:54 [PATCH v2] ipv4: fix a RCU-list lock in inet_dump_fib() Qian Cai
2020-03-20 15:23 ` David Ahern
2020-03-24 4:00 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).