Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a98dcf0 authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller
Browse files

ipv6: fix a RCU warning in net/ipv6/ip6_flowlabel.c 



This patch fixes the following RCU warning:

[   51.680236] ===============================
[   51.681914] [ INFO: suspicious RCU usage. ]
[   51.683610] 3.8.0-rc6-next-20130206-sasha-00028-g83214f7-dirty #276 Tainted: G        W
[   51.686703] -------------------------------
[   51.688281] net/ipv6/ip6_flowlabel.c:671 suspicious rcu_dereference_check() usage!

we should use rcu_dereference_bh() when we hold rcu_read_lock_bh().

Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14f8dc49

net/ipv6/ip6_flowlabel.c

+4 −4
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ static DEFINE_SPINLOCK(ip6_fl_lock); 
static DEFINE_SPINLOCK(ip6_sk_fl_lock);



#define for_each_fl_rcu(hash, fl)				\

	for (fl = rcu_dereference(fl_ht[(hash)]);		\

	for (fl = rcu_dereference_bh(fl_ht[(hash)]);		\

	     fl != NULL;					\

	     fl = rcu_dereference(fl->next))

	     fl = rcu_dereference_bh(fl->next))

#define for_each_fl_continue_rcu(fl)				\

	for (fl = rcu_dereference(fl->next);			\

	for (fl = rcu_dereference_bh(fl->next);			\

	     fl != NULL;					\

	     fl = rcu_dereference(fl->next))

	     fl = rcu_dereference_bh(fl->next))



#define for_each_sk_fl_rcu(np, sfl)				\

	for (sfl = rcu_dereference_bh(np->ipv6_fl_list);	\