aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Efremov <yefremov.denis@gmail.com>2012-08-11 20:26:31 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-12 13:40:48 -0700
commit3a7f8c34fefb109903af9a0fac6d0d05f93335c5 (patch)
tree486426c2c3c3add25526788faf06dd93f99ec12a
parent2359a47671fc4fb0fe5e9945f76c2cb10792c0f8 (diff)
macvtap: rcu_dereference outside read-lock section
rcu_dereference occurs in update section. Replacement by rcu_dereference_protected in order to prevent lockdep complaint. Found by Linux Driver Verification project (linuxtesting.org) Signed-off-by: Denis Efremov <yefremov.denis@gmail.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/macvtap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 0737bd4..0f0f9ce 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -94,7 +94,8 @@ static int get_slot(struct macvlan_dev *vlan, struct macvtap_queue *q)
int i;
for (i = 0; i < MAX_MACVTAP_QUEUES; i++) {
- if (rcu_dereference(vlan->taps[i]) == q)
+ if (rcu_dereference_protected(vlan->taps[i],
+ lockdep_is_held(&macvtap_lock)) == q)
return i;
}