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=-9.8 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,URIBL_BLOCKED,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 F33C0C388F7 for ; Tue, 3 Nov 2020 20:50:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B217B22404 for ; Tue, 3 Nov 2020 20:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436656; bh=vLpUuXDYQpnWLZoBKjvG/J6ILa7TA2aLVD0Lq/SKsGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KHKvloDiNz50qbhgW+59hkZgOFByyJj1h1sNP+ePM5XZcZQVdeA7EzbNOJcg6lP/H m9k12KBIuteF8LTSMo1hxQ2GpGdzizL2acoy+NsiIwyEL8FsJPPnaKn4FGfGEPaklg m+2vjA9n7h6EB7GR6oPgtnyQLd/Pi99pdKZiiuso= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731881AbgKCUuz (ORCPT ); Tue, 3 Nov 2020 15:50:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:45326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731861AbgKCUuv (ORCPT ); Tue, 3 Nov 2020 15:50:51 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 A9B5C20719; Tue, 3 Nov 2020 20:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436651; bh=vLpUuXDYQpnWLZoBKjvG/J6ILa7TA2aLVD0Lq/SKsGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QjUBWYskdq+GHrU0mD5FnGTGfvhN6vjLpuNpUgnqCL6on55ZMNzOibVeCWJL1M+pW hQIP9F9CMI2tx36x78JvgcFkweL9uHJVVNKn/ZCPH8lGY2+fjJ9dol8Ud3n+MjxN5F xIrL4imnrYDv0peYVi9g5Xy5C8wBaaHohgSqBVKo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Dinghao Liu , Andreas Dilger , Theodore Tso Subject: [PATCH 5.9 341/391] ext4: fix error handling code in add_new_gdb Date: Tue, 3 Nov 2020 21:36:32 +0100 Message-Id: <20201103203410.145751791@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu commit c9e87161cc621cbdcfc472fa0b2d81c63780c8f5 upstream. When ext4_journal_get_write_access() fails, we should terminate the execution flow and release n_group_desc, iloc.bh, dind and gdb_bh. Cc: stable@kernel.org Signed-off-by: Dinghao Liu Reviewed-by: Andreas Dilger Link: https://lore.kernel.org/r/20200829025403.3139-1-dinghao.liu@zju.edu.cn Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/resize.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -843,8 +843,10 @@ static int add_new_gdb(handle_t *handle, BUFFER_TRACE(dind, "get_write_access"); err = ext4_journal_get_write_access(handle, dind); - if (unlikely(err)) + if (unlikely(err)) { ext4_std_error(sb, err); + goto errout; + } /* ext4_reserve_inode_write() gets a reference on the iloc */ err = ext4_reserve_inode_write(handle, inode, &iloc);