diff options
| author | Josh Triplett <josh@freedesktop.org> | 2006-06-30 02:02:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-30 02:02:31 +0200 |
| commit | 1bc1731133140dccdd08899a59bbc06d975d0a15 (patch) | |
| tree | 5264ce0882490e4d432d5c8e9f19f9a1b1c2a43e /net/irda/irlan | |
| parent | [XFRM]: unexport xfrm_state_mtu (diff) | |
| download | linux-1bc1731133140dccdd08899a59bbc06d975d0a15.tar.xz linux-1bc1731133140dccdd08899a59bbc06d975d0a15.zip | |
[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>
Diffstat (limited to 'net/irda/irlan')
| -rw-r--r-- | net/irda/irlan/irlan_client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c index f8e6cb0db04b..95cf1234ea17 100644 --- a/net/irda/irlan/irlan_client.c +++ b/net/irda/irlan/irlan_client.c @@ -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(); } |