Commit 1bc17311 authored by Josh Triplett's avatar Josh Triplett Committed by David S. Miller

[IrDA]: Fix RCU lock pairing on error path

irlan_client_discovery_indication calls rcu_read_lock and rcu_read_unlock, but
returns without unlocking in an error case.  Fix that by replacing the return
with a goto so that the rcu_read_unlock always gets executed.
Signed-off-by: default avatarJosh Triplett <josh@freedesktop.org>
Acked-by: default avatarPaul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Samuel Ortiz samuel@sortiz.org <>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 244055fd
...@@ -173,13 +173,14 @@ void irlan_client_discovery_indication(discinfo_t *discovery, ...@@ -173,13 +173,14 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
rcu_read_lock(); rcu_read_lock();
self = irlan_get_any(); self = irlan_get_any();
if (self) { if (self) {
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); IRDA_ASSERT(self->magic == IRLAN_MAGIC, goto out;);
IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ , IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ ,
daddr); daddr);
irlan_client_wakeup(self, saddr, daddr); irlan_client_wakeup(self, saddr, daddr);
} }
IRDA_ASSERT_LABEL(out:)
rcu_read_unlock(); rcu_read_unlock();
} }
......
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