From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751947AbZA1RyQ (ORCPT ); Wed, 28 Jan 2009 12:54:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751705AbZA1Rxq (ORCPT ); Wed, 28 Jan 2009 12:53:46 -0500 Received: from cantor.suse.de ([195.135.220.2]:53890 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbZA1Rxp (ORCPT ); Wed, 28 Jan 2009 12:53:45 -0500 From: Jiri Slaby To: greg@kroah.com Cc: chrisw@sous-sol.org, stable@kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby , Ingo Molnar Subject: [PATCH stable-27 2/2] relay: fix lock imbalance in relay_late_setup_files Date: Wed, 28 Jan 2009 18:53:38 +0100 Message-Id: <1233165221-20106-2-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.6.0.1 In-Reply-To: <1233165221-20106-1-git-send-email-jslaby@suse.cz> References: <1233165221-20106-1-git-send-email-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Slaby One fail path in relay_late_setup_files() omits mutex_unlock(&relay_channels_mutex); Add it. Commit b786c6a98ef6fa81114ba7b9fbfc0d67060775e3. Signed-off-by: Jiri Slaby Signed-off-by: Ingo Molnar --- kernel/relay.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/kernel/relay.c b/kernel/relay.c index 8d13a78..b0bbf6f 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -664,8 +664,10 @@ int relay_late_setup_files(struct rchan *chan, mutex_lock(&relay_channels_mutex); /* Is chan already set up? */ - if (unlikely(chan->has_base_filename)) + if (unlikely(chan->has_base_filename)) { + mutex_unlock(&relay_channels_mutex); return -EEXIST; + } chan->has_base_filename = 1; chan->parent = parent; curr_cpu = get_cpu(); -- 1.6.1