ipv4: fix lockdep splat in rt_cache_seq_show (218fa90f) · Commits · 戴 / test

After commit (fix NULL dereferences in check_peer_redir()), dst_get_neighbour() should be guarded by rcu_read_lock() / rcu_read_unlock() section. Reported-by:

Miles Lane <miles.lane@gmail.com> Signed-off-by:

Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/route.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -417,9 +417,13 @@ static int rt_cache_seq_show(struct seq_file seq, void v)
		else {
		struct rtable *r = v;
		struct neighbour *n;
		int len;
		int len, HHUptod;

		rcu_read_lock();
		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"
		"%08X\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X%n",
		r->dst.dev ? r->dst.dev->name : "*",
		@@ -433,7 +437,7 @@ static int rt_cache_seq_show(struct seq_file seq, void v)
		dst_metric(&r->dst, RTAX_RTTVAR)),
		r->rt_key_tos,
		-1,
		(n && (n->nud_state & NUD_CONNECTED)) ? 1 : 0,
		HHUptod,
		r->rt_spec_dst, &len);

		seq_printf(seq, "%*s\n", 127 - len, "");

Admin message