From patchwork Thu Feb 27 13:35:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 230098 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1DF1C11D3D for ; Thu, 27 Feb 2020 14:49:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B09A824656 for ; Thu, 27 Feb 2020 14:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582814957; bh=rkuvV1vDKr1HQorDLFRpd239XFUJLaUI6HjBIYZknYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VOARdsj/PdVgll3BefccIOzoqgfkyXATfoAcI7IEdvg4j3WOaPBJ38RAfvdDIGvSz mKDh9fcdQIBlKK+5rvhIC6xZ6K/PNgWObXmYHcRhQH1XFtztbqX6T0mwlSFjAF0OOS G+lxU1oz2/jn9WBDMUYXVeIV87acJeplk5jexeMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730139AbgB0OtR (ORCPT ); Thu, 27 Feb 2020 09:49:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:36252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729613AbgB0Nle (ORCPT ); Thu, 27 Feb 2020 08:41:34 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D48C4222C2; Thu, 27 Feb 2020 13:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582810894; bh=rkuvV1vDKr1HQorDLFRpd239XFUJLaUI6HjBIYZknYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Swoh8yGYuIyN8/AnCQZTsLnFoFlZNEtCzarD0XoYIaFHFsvMt9+lCcVkwsaeTGAKO vOZKT9RjYuxM19dt9vgM+r78XkNi35pUAv1Vb2VxBX2r/2MgFplS7FSywI87uypecN 4kPn+0K4kNNzT2H5uWKcHh6Ci312PevaF3zgwjlU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Kara , Sasha Levin Subject: [PATCH 4.4 038/113] reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling Date: Thu, 27 Feb 2020 14:35:54 +0100 Message-Id: <20200227132217.813853689@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132211.791484803@linuxfoundation.org> References: <20200227132211.791484803@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jan Kara [ Upstream commit 4d5c1adaf893b8aa52525d2b81995e949bcb3239 ] When we fail to allocate string for journal device name we jump to 'error' label which tries to unlock reiserfs write lock which is not held. Jump to 'error_unlocked' instead. Fixes: f32485be8397 ("reiserfs: delay reiserfs lock until journal initialization") Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/reiserfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 519bf410e65b2..f9796fd515315 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -1921,7 +1921,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) if (!sbi->s_jdev) { SWARN(silent, s, "", "Cannot allocate memory for " "journal device name"); - goto error; + goto error_unlocked; } } #ifdef CONFIG_QUOTA