| Message ID | 20200223171945.11391-2-frextrite@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [1/2] netfilter: Pass lockdep expression to __instance_lookup traversal | expand |
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index feabdfb22920..5aef41847774 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -105,7 +105,8 @@ instance_lookup(struct nfnl_queue_net *q, u_int16_t queue_num) struct nfqnl_instance *inst; head = &q->instance_table[instance_hashfn(queue_num)]; - hlist_for_each_entry_rcu(inst, head, hlist) { + hlist_for_each_entry_rcu(inst, head, hlist, + lockdep_is_held(&q->instances_lock)) { if (inst->queue_num == queue_num) return inst; }
q->instance_table[] may be traversed outside an RCU read-side critical section but under the protection of q->instances_lock. Hence, add the corresponding lockdep expression to silence false-positive lockdep warnings. Signed-off-by: Amol Grover <frextrite@gmail.com> --- net/netfilter/nfnetlink_queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)