The patch titled
irda: Fix RCU lock pairing on error path
has been added to the -mm tree. Its filename is
irda-fix-rcu-lock-pairing-on-error-path.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: irda: Fix RCU lock pairing on error path
From: Josh Triplett <josht@xxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/irda/irlan/irlan_client.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN net/irda/irlan/irlan_client.c~irda-fix-rcu-lock-pairing-on-error-path net/irda/irlan/irlan_client.c
--- a/net/irda/irlan/irlan_client.c~irda-fix-rcu-lock-pairing-on-error-path
+++ a/net/irda/irlan/irlan_client.c
@@ -173,13 +173,14 @@ void irlan_client_discovery_indication(d
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);
}
+out:
rcu_read_unlock();
}
_
Patches currently in -mm which might be from josht@xxxxxxxxxxxx are
irda-fix-rcu-lock-pairing-on-error-path.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
