From patchwork Fri May 1 13:21:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226691 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,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 5A491C47253 for ; Fri, 1 May 2020 13:27:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F2862166E for ; Fri, 1 May 2020 13:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339659; bh=0bmmoobu5JO6/P+JWnOrpzSDyd+b/gmKezvE5yBlgME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R1BdONOMuax18pcYM18ew7absrvNazTNm1bgEMwMKCU4VHE0R6MaE/AVx0H3mbGtY 4nXNcV+Nilkmf2y4qidS1rkhKLORWqSN2fs9B4Ele934P6gXReD+Tm9i/ElX5nONHk BV/VBoWhILsybsohUHIFpHd2oiFpjiAG5cRdMwmk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729497AbgEAN1i (ORCPT ); Fri, 1 May 2020 09:27:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:49970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729488AbgEAN1g (ORCPT ); Fri, 1 May 2020 09:27:36 -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 B0D92208D6; Fri, 1 May 2020 13:27:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339655; bh=0bmmoobu5JO6/P+JWnOrpzSDyd+b/gmKezvE5yBlgME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qdp1eN8bcbEHwdfNTll6ki+qD3t1uw2CpOGs1Ou/4rzgyiIGdbessqVgqducEPxGi RJOcYUB6Uy0Wim9uwuMUH8dGxkEYmzck95KSonY+SEAkCSSlz7p1COgpRduO+QOZ7S TLOIbK8rZ0hl7jWKXMyAT4aJpcVj8kQgHKzIf3/s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arthur Marsh , Theodore Tso , Ashwin H Subject: [PATCH 4.4 69/70] ext4: fix block validity checks for journal inodes using indirect blocks Date: Fri, 1 May 2020 15:21:57 +0200 Message-Id: <20200501131534.862556194@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131513.302599262@linuxfoundation.org> References: <20200501131513.302599262@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: Theodore Ts'o commit 170417c8c7bb2cbbdd949bf5c443c0c8f24a203b upstream. Commit 345c0dbf3a30 ("ext4: protect journal inode's blocks using block_validity") failed to add an exception for the journal inode in ext4_check_blockref(), which is the function used by ext4_get_branch() for indirect blocks. This caused attempts to read from the ext3-style journals to fail with: [ 848.968550] EXT4-fs error (device sdb7): ext4_get_branch:171: inode #8: block 30343695: comm jbd2/sdb7-8: invalid block Fix this by adding the missing exception check. Fixes: 345c0dbf3a30 ("ext4: protect journal inode's blocks using block_validity") Reported-by: Arthur Marsh Signed-off-by: Theodore Ts'o Signed-off-by: Ashwin H Signed-off-by: Greg Kroah-Hartman --- fs/ext4/block_validity.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -274,6 +274,11 @@ int ext4_check_blockref(const char *func __le32 *bref = p; unsigned int blk; + if (ext4_has_feature_journal(inode->i_sb) && + (inode->i_ino == + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_journal_inum))) + return 0; + while (bref < p+max) { blk = le32_to_cpu(*bref++); if (blk &&