Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2419274imu; Tue, 6 Nov 2018 14:21:06 -0800 (PST) X-Google-Smtp-Source: AJdET5cOfXi9vGVAEongwoemPV5Hi3m4fsr0cE81W75ez+0FiA35JMCF/0XUJVM8t3j/5ArOpdKy X-Received: by 2002:a63:451a:: with SMTP id s26mr15585494pga.150.1541542866161; Tue, 06 Nov 2018 14:21:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541542866; cv=none; d=google.com; s=arc-20160816; b=VIds9heUg1+opQ6Td5TS9ezHb0rzg9zQyDRY8EnTZObrUny0iGUw952pVJfhQnfbHF iZq1DHIP3xTvMHUtTSsbKbrSrFf/LvRCxHL55yRkrEWbQOPGbfbhkz4ViR/WcIyoTTqt WqdmU4YAkTJGkYGS/0b+W1VAU4GYtG/NkmyE5xWYJRPuyZzjYdofblcj3ab/KlpKj+vM S0apJeD4/zV9K1duP25csk30TKNLycg35K4neMfQCx/cLO5QICXOlThyd56LPfMCnauR 2tZ0NP53FYPK9fLK7h2L8ZCVey6NIdJQxkSm+EX8iZkYC8RzsAwwdwkZdd4kjvIYKHFT 0iMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:mail-followup-to :message-id:subject:cc:to:from:date:dkim-signature; bh=fJrIqHkC9A2YKvga1stdgo7VXOejR7UQozFrZWblXuU=; b=X/FcuGnioueaRoafTPFMWxd9At5Vtk9HsPWsbH4x2gC1fUW978SPBSFxGAqvAB0dCt q4wtcWzSeLQqe9Hvs/W2RNdU0nosyOnbS951xwFwxcjGXubucNibDm3O50DEG7IXQmIR WaBLSBr+adH9z3ewgl1dErKo+c1dYKK/aPIDoK9rbsYns3b6ZgXaM+h4q5aY5nbvt87/ B/m+mDShewfn0cPf3Bi4zVVF0YSg4eRmDiK7Pk0JkhbhfWFFSXDu97QQBAY1l8RfGSq1 iw0lKOAck5hQNx2/YRWlbcuVkYLX80FdARcMqiEII+8b36V/iyB0EZzJz5IC/vSsy1df 14OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@thunk.org header.s=ef5046eb header.b=thWwudPE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o10-v6si18348727pls.402.2018.11.06.14.20.50; Tue, 06 Nov 2018 14:21:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@thunk.org header.s=ef5046eb header.b=thWwudPE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727248AbeKGHqd (ORCPT + 99 others); Wed, 7 Nov 2018 02:46:33 -0500 Received: from imap.thunk.org ([74.207.234.97]:46204 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725951AbeKGHqd (ORCPT ); Wed, 7 Nov 2018 02:46:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fJrIqHkC9A2YKvga1stdgo7VXOejR7UQozFrZWblXuU=; b=thWwudPEZoiWTejvvxr2+DTtyP meMnCq5eU7dU2yDWgJFs3nibpicow7Q/TXJziCh0GGKU6uz6A5iKeDGuiSBCMOlNqXYoZhs7uHNal NEkceeAs/Zz/gOnadhnhhy9sPGJtmLzlyd/eUgKbqMXt0jwMPxuE50Ul0M03fLy2X0kg=; Received: from root (helo=callcc.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.89) (envelope-from ) id 1gK9gh-0006CQ-A4; Tue, 06 Nov 2018 22:19:07 +0000 Received: by callcc.thunk.org (Postfix, from userid 15806) id 1CF457A7C2F; Tue, 6 Nov 2018 17:19:06 -0500 (EST) Date: Tue, 6 Nov 2018 17:19:05 -0500 From: "Theodore Y. Ts'o" To: Vasily Averin Cc: linux-ext4@vger.kernel.org, Andreas Dilger , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 09/11] ext4: iloc.bh cleanup in add_new_gdb() Message-ID: <20181106221905.GH2570@thunk.org> Mail-Followup-To: "Theodore Y. Ts'o" , Vasily Averin , linux-ext4@vger.kernel.org, Andreas Dilger , linux-kernel@vger.kernel.org References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 31, 2018 at 12:58:38AM +0300, Vasily Averin wrote: > iloc.bh was taken in ext4_reserve_inode_write() and released > in ext4_mark_iloc_dirty(). It should not be released 2nd time > in rollback after failed ext4_handle_dirty_metadata(gdb_bh) > > Fixes b40971426a83 ("ext4: add error checking to calls to ...") # 2.6.38 > > Signed-off-by: Vasily Averin I fixed this in a simpler way: From 6a91a2eb1c5af1381caebfb4c1c91dc175351f6f Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 6 Nov 2018 17:18:17 -0500 Subject: [PATCH] ext4: avoid possible double brelse() in add_new_gdb() on error path Fixes: b40971426a83 ("ext4: add error checking to calls to ...") Reported-by: Vasily Averin Signed-off-by: Theodore Ts'o Cc: stable@vger.kernel.org # 2.6.38 --- fs/ext4/resize.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 85158e9de7c2..a5efee34415f 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -871,6 +871,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, err = ext4_handle_dirty_metadata(handle, NULL, gdb_bh); if (unlikely(err)) { ext4_std_error(sb, err); + iloc.bh = NULL; goto exit_inode; } brelse(dind); -- 2.18.0.rc0