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=-6.8 required=3.0 tests=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 65920C2D0BF for ; Mon, 16 Dec 2019 18:01:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D952207FF for ; Mon, 16 Dec 2019 18:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519284; bh=tQnQ7eGrRB4decAAN2WbhDaaCkvZX5ZKgulZVP1wGHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G5zZC1L4qyyDU8DpUgDLfEKf/jmGCv/Zk2iC/Levl543HU/VwBKMlXATHtKPlPyTm kj+d2FZCF7+JN32IGK46zkw/EKx9NLPrYntnp2wUAoiTmwPWrCadp1VtjA5sGuQMpp iPEE9qx2UCY/z+hNaIL1COTWc0lglriZTT3YzREU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728816AbfLPSBX (ORCPT ); Mon, 16 Dec 2019 13:01:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:36318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726861AbfLPSBW (ORCPT ); Mon, 16 Dec 2019 13:01:22 -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 9F2062072D; Mon, 16 Dec 2019 18:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519282; bh=tQnQ7eGrRB4decAAN2WbhDaaCkvZX5ZKgulZVP1wGHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aGzv/7T9hqONQyLYaa9tQesdmmdZu8Z0koiPA9Lh6Qxl12eZs8FiKhcZozl9Ptw+E Xgur/ep+VtKmVniwreguL9mnT8/ZQG2PrmbJIdmULm0xTgI9zU0EN3NkHtc+ktkbxX GXkcZS3DaqSHfXqbJ2qsOytoikXgruRoDr5QPYtw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chengguang Xu , Jan Kara Subject: [PATCH 4.14 233/267] ext2: check err when partial != NULL Date: Mon, 16 Dec 2019 18:49:19 +0100 Message-Id: <20191216174915.322920804@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chengguang Xu commit e705f4b8aa27a59f8933e8f384e9752f052c469c upstream. Check err when partial == NULL is meaningless because partial == NULL means getting branch successfully without error. CC: stable@vger.kernel.org Link: https://lore.kernel.org/r/20191105045100.7104-1-cgxu519@mykernel.net Signed-off-by: Chengguang Xu Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman --- fs/ext2/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -699,10 +699,13 @@ static int ext2_get_blocks(struct inode if (!partial) { count++; mutex_unlock(&ei->truncate_mutex); - if (err) - goto cleanup; goto got_it; } + + if (err) { + mutex_unlock(&ei->truncate_mutex); + goto cleanup; + } } /*