Commit 218fa90f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

ipv4: fix lockdep splat in rt_cache_seq_show

After commit f2c31e32 (fix NULL dereferences in check_peer_redir()),
dst_get_neighbour() should be guarded by rcu_read_lock() /
rcu_read_unlock() section.
Reported-by: default avatarMiles Lane <miles.lane@gmail.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7e57044
...@@ -417,9 +417,13 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) ...@@ -417,9 +417,13 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v)
else { else {
struct rtable *r = v; struct rtable *r = v;
struct neighbour *n; struct neighbour *n;
int len; int len, HHUptod;
rcu_read_lock();
n = dst_get_neighbour(&r->dst); n = dst_get_neighbour(&r->dst);
HHUptod = (n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0;
rcu_read_unlock();
seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t" seq_printf(seq, "%s\t%08X\t%08X\t%8X\t%d\t%u\t%d\t"
"%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n", "%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n",
r->dst.dev ? r->dst.dev->name : "*", r->dst.dev ? r->dst.dev->name : "*",
...@@ -433,7 +437,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) ...@@ -433,7 +437,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v)
dst_metric(&r->dst, RTAX_RTTVAR)), dst_metric(&r->dst, RTAX_RTTVAR)),
r->rt_key_tos, r->rt_key_tos,
-1, -1,
(n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0, HHUptod,
r->rt_spec_dst, &len); r->rt_spec_dst, &len);
seq_printf(seq, "%*s\n", 127 - len, ""); seq_printf(seq, "%*s\n", 127 - len, "");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment