mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Josh Triplett <josht@vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: Paul McKenney <paulmck@us.ibm.com>,
	Dipkanar Sarma <dipankar@in.ibm.com>,
	Andrew Morton <akpm@osdl.org>, Samuel Ortiz <samuel@sortiz.org>
Subject: [PATCH] irda: Fix RCU lock pairing on error path
Date: Wed, 28 Jun 2006 17:56:41 -0700	[thread overview]
Message-ID: <1151542602.18723.19.camel@josh-work.beaverton.ibm.com> (raw)

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>

---

 net/irda/irlan/irlan_client.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

e20ab96944814489277c3bfd4e69133854ab01e9
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index f8e6cb0..5ce7d2e 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/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();
 }
 	



             reply	other threads:[~2006-06-29  0:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-29  0:56 Josh Triplett [this message]
2006-06-29 14:27 ` Paul E. McKenney
2006-06-29 14:59   ` Samuel Ortiz
2006-06-30  6:55   ` [PATCH 1/2] [IrDA] " Samuel Ortiz
2006-06-30  0:02     ` David Miller
2006-06-29 19:48 ` [PATCH] irda: " David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1151542602.18723.19.camel@josh-work.beaverton.ibm.com \
    --to=josht@vnet.ibm.com \
    --cc=akpm@osdl.org \
    --cc=dipankar@in.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paulmck@us.ibm.com \
    --cc=samuel@sortiz.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®