From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DBBB145FE7; Thu, 11 Apr 2024 10:10:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830243; cv=none; b=GD1vyWavIHiQRT+DNEiItFPeMqnguUF45DrbB5SMhNnDNsKVnT6jTXGofmkcYU9D3EVaHEGHcBGmVactSyxtDW8dzUxHXUOcMUbwttnKYv9+8iJjrC50VtBKLoKeudLiTDEnDgrlrHiU6oOZ4BwTAR8Cq8fts+eXfct8HpXsUaA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830243; c=relaxed/simple; bh=hhzokIM22OKjrGyRjg6h+/+XlUfXgNUr2AJwg8gVsfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GGxAthC0DRtKi1duaK6JcmDhH1Y1cH9wWYI7OAnt5DdL7Pm7lag3J6qc/BomIwAAXxv34J9+Ws2BW0rkKiht4iRyekHo8RQRgfRgGdZKE51WYseZFwhTMggGxpdzojNirWLfZRuCZsPB0PpwLM+SJCbTFHS2cUboD3wAWwTZUCA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=InBa1XjQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="InBa1XjQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C637C433C7; Thu, 11 Apr 2024 10:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712830243; bh=hhzokIM22OKjrGyRjg6h+/+XlUfXgNUr2AJwg8gVsfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=InBa1XjQXIqzlJ8HyQwz2yaW8Nxoom3FLTapc7rrZJjeFgZU4C/lu9YtWWD9jOYrS WMIMXdz+atwGKzgfDQpetMJ7/0UZd9/jjqLxYPXXLoHw5IQg0jUn2nJX5KFmX7+o8V 0cb8X/ShC2qUJqMehSljZs0FMpUYcajMbLHIWdiU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ye Bin , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 6.8 082/143] ext4: forbid commit inconsistent quota data when errors=remount-ro Date: Thu, 11 Apr 2024 11:55:50 +0200 Message-ID: <20240411095423.381102282@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095420.903937140@linuxfoundation.org> References: <20240411095420.903937140@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ye Bin [ Upstream commit d8b945fa475f13d787df00c26a6dc45a3e2e1d1d ] There's issue as follows When do IO fault injection test: Quota error (device dm-3): find_block_dqentry: Quota for id 101 referenced but not present Quota error (device dm-3): qtree_read_dquot: Can't read quota structure for id 101 Quota error (device dm-3): do_check_range: Getting block 2021161007 out of range 1-186 Quota error (device dm-3): qtree_read_dquot: Can't read quota structure for id 661 Now, ext4_write_dquot()/ext4_acquire_dquot()/ext4_release_dquot() may commit inconsistent quota data even if process failed. This may lead to filesystem corruption. To ensure filesystem consistent when errors=remount-ro there is need to call ext4_handle_error() to abort journal. Signed-off-by: Ye Bin Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20240119062908.3598806-1-yebin10@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 32bd83adf0bb8..4866657c6d41f 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6864,6 +6864,10 @@ static int ext4_write_dquot(struct dquot *dquot) if (IS_ERR(handle)) return PTR_ERR(handle); ret = dquot_commit(dquot); + if (ret < 0) + ext4_error_err(dquot->dq_sb, -ret, + "Failed to commit dquot type %d", + dquot->dq_id.type); err = ext4_journal_stop(handle); if (!ret) ret = err; @@ -6880,6 +6884,10 @@ static int ext4_acquire_dquot(struct dquot *dquot) if (IS_ERR(handle)) return PTR_ERR(handle); ret = dquot_acquire(dquot); + if (ret < 0) + ext4_error_err(dquot->dq_sb, -ret, + "Failed to acquire dquot type %d", + dquot->dq_id.type); err = ext4_journal_stop(handle); if (!ret) ret = err; @@ -6899,6 +6907,10 @@ static int ext4_release_dquot(struct dquot *dquot) return PTR_ERR(handle); } ret = dquot_release(dquot); + if (ret < 0) + ext4_error_err(dquot->dq_sb, -ret, + "Failed to release dquot type %d", + dquot->dq_id.type); err = ext4_journal_stop(handle); if (!ret) ret = err; -- 2.43.0