From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 7E292C433E1 for ; Mon, 24 Aug 2020 08:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 51923207D3 for ; Mon, 24 Aug 2020 08:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598259284; bh=HQffJ2Pn9vxDua6M0lEdt3wiTIc8vlMpCHt4/DZucdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RwUTBQPrRw/L0qEKta+uYiXQL8fMJwEX0BM8a3ptO8xnPXzPa1Y7Zjz3tjNl3BjEa JZwv7axygJCuFlNVzfkS2Ev2UXPc3j8zpCCSBMXw03201H/V4pg+TzDV/LoOygM4O3 et3KpJprN3kNJkwyGjAlsxmjaqn+ENtUMj7Q9OOI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729646AbgHXIym (ORCPT ); Mon, 24 Aug 2020 04:54:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:35256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728932AbgHXIyd (ORCPT ); Mon, 24 Aug 2020 04:54:33 -0400 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 30962207D3; Mon, 24 Aug 2020 08:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598259273; bh=HQffJ2Pn9vxDua6M0lEdt3wiTIc8vlMpCHt4/DZucdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q7Z6cGGXVUSgWJz3DLs+rUvGUJKrx6Kj+x16UvhpO3lcfJ4FEYlxxTA+Gj7F4jbl6 RHTufWwppwuRpiObFRGL1v34OFihyU9j5IxPb/ZyK9130bEjICQewwMV25FMVaZFbK sF57sS8vg4KHdpiXyfPFvZYeZIWYJR9og/DkwIrA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "zhangyi (F)" , Ritesh Harjani , stable@kernel.org, Theodore Tso Subject: [PATCH 4.14 17/50] jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock() Date: Mon, 24 Aug 2020 10:31:18 +0200 Message-Id: <20200824082352.863997095@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082351.823243923@linuxfoundation.org> References: <20200824082351.823243923@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: zhangyi (F) commit ef3f5830b859604eda8723c26d90ab23edc027a4 upstream. jbd2_write_superblock() is under the buffer lock of journal superblock before ending that superblock write, so add a missing unlock_buffer() in in the error path before submitting buffer. Fixes: 742b06b5628f ("jbd2: check superblock mapped prior to committing") Signed-off-by: zhangyi (F) Reviewed-by: Ritesh Harjani Cc: stable@kernel.org Link: https://lore.kernel.org/r/20200620061948.2049579-1-yi.zhang@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/jbd2/journal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1356,8 +1356,10 @@ static int jbd2_write_superblock(journal int ret; /* Buffer got discarded which means block device got invalidated */ - if (!buffer_mapped(bh)) + if (!buffer_mapped(bh)) { + unlock_buffer(bh); return -EIO; + } trace_jbd2_write_superblock(journal, write_flags); if (!(journal->j_flags & JBD2_BARRIER))