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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 822AAC43381 for ; Wed, 27 Mar 2019 19:30:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43B212075C for ; Wed, 27 Mar 2019 19:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553715003; bh=vOWr6nCvbaiF3lCzop1vDUGXuj5KMLJjAQGHE5o7Rks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bSQHNkEscyCI2tYKe7bPrg/nex4BZRVu9zuYExE751NO/y3yy5pQRjv6co4GBgVBY xDSSMCPR1H8EuJKfRgQVSAd5+4YDa6vo0fBFEPIJ5DHvQ2u5SzPHuZSTWCdwrykZMG k3hhSne3V2MqXfTQsIAGXfKclmAIE1PWFlH2c+T4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387633AbfC0TaB (ORCPT ); Wed, 27 Mar 2019 15:30:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:43966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732672AbfC0SDj (ORCPT ); Wed, 27 Mar 2019 14:03:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 038F42183E; Wed, 27 Mar 2019 18:03:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709818; bh=vOWr6nCvbaiF3lCzop1vDUGXuj5KMLJjAQGHE5o7Rks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KE14pBeOt3Oolsruv8TsytJ47J77/UdF8oO2LpMarwBhcXYhKmXcpIc17NgVWAqmd YhLKgygog5kz1jYGqaGMn3S5fzO8Cx+OgGGL0ijEeRqy1EitnqolEKXPq7GePuFaKW tMjAXR2+Uu0MjXB8kue+74Y92RGXvPOldolHmaD4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: luojiajun , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 057/262] jbd2: fix invalid descriptor block checksum Date: Wed, 27 Mar 2019 13:58:32 -0400 Message-Id: <20190327180158.10245-57-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: luojiajun [ Upstream commit 6e876c3dd205d30b0db6850e97a03d75457df007 ] In jbd2_journal_commit_transaction(), if we are in abort mode, we may flush the buffer without setting descriptor block checksum by goto start_journal_io. Then fs is mounted, jbd2_descriptor_block_csum_verify() failed. [ 271.379811] EXT4-fs (vdd): shut down requested (2) [ 271.381827] Aborting journal on device vdd-8. [ 271.597136] JBD2: Invalid checksum recovering block 22199 in log [ 271.598023] JBD2: recovery failed [ 271.598484] EXT4-fs (vdd): error loading journal Fix this problem by keep setting descriptor block checksum if the descriptor buffer is not NULL. This checksum problem can be reproduced by xfstests generic/388. Signed-off-by: luojiajun Signed-off-by: Theodore Ts'o Reviewed-by: Jan Kara Signed-off-by: Sasha Levin --- fs/jbd2/commit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 2eb55c3361a8..efd0ce9489ae 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -694,9 +694,11 @@ void jbd2_journal_commit_transaction(journal_t *journal) the last tag we set up. */ tag->t_flags |= cpu_to_be16(JBD2_FLAG_LAST_TAG); - - jbd2_descriptor_block_csum_set(journal, descriptor); start_journal_io: + if (descriptor) + jbd2_descriptor_block_csum_set(journal, + descriptor); + for (i = 0; i < bufs; i++) { struct buffer_head *bh = wbuf[i]; /* -- 2.19.1