Commit 1bc17311 authored Jun 29, 2006 by Josh Triplett Committed by David S. Miller Jun 29, 2006

[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: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Samuel Ortiz samuel@sortiz.org <>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 244055fd

net/irda/irlan/irlan_client.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -173,13 +173,14 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
		rcu_read_lock();
		self = irlan_get_any();
		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__ ,
		daddr);

		irlan_client_wakeup(self, saddr, daddr);
		}
		IRDA_ASSERT_LABEL(out:)
		rcu_read_unlock();
		}