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 DE5F81A76CE; Mon, 14 Oct 2024 15:20:19 +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=1728919220; cv=none; b=LJ8/3qMsWoE4aZrO4tRZYWC6luuvfx3RlGsej8XYlxwlitUmLnNNm80sLVS0Qug4JOIUSrbvJqze6JkWZKqjPhLeH7an1zctRFaaWRCgu1k14YkpYycQpBLmaWXOu9cLSXOaTyW41VYdTrcL5jAbv7MopOSirxAIByOLkGfJsDU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919220; c=relaxed/simple; bh=kYxtst4CboctwJ4OZhCFIucXjen7GiluE98spYX2mkM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GLpmjJeCp9oPtBSesO0eb6GQ/gOpqjSgRQxT5INJwY6oONT5vYlMWAMAyKOWeI6CQs7iGCNu7YFecpkUpDWu6TKTfHu8q3MiljyseVurgTxSUJkx0LkmsIx2GCLM3msAqljQxgvAn/Nuj9omAvN7vuzzv8hXyMiYF/uc6DuW3t4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gbtCZ0R/; 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="gbtCZ0R/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 500F1C4CEC3; Mon, 14 Oct 2024 15:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919219; bh=kYxtst4CboctwJ4OZhCFIucXjen7GiluE98spYX2mkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gbtCZ0R/Ow+L3kCIVRkdJ4DbWZLIcV1T+zee8uRUpSqfN48iGtKTeroUnOQPXRbtH dPWakrT14lA+f4kUPcqeCUdhCm/HYsvnHv0m9YxvYz0Uq/Ruu/zxiO3Z1p17QbpD0y VUzUq6W7Kbmiu90Qd3Sfs4LDH3ZaSdJZty1pIIlk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Luis Henriques (SUSE)" , Jan Kara , Theodore Tso , stable@kernel.org Subject: [PATCH 6.1 547/798] ext4: fix incorrect tid assumption in __jbd2_log_wait_for_space() Date: Mon, 14 Oct 2024 16:18:21 +0200 Message-ID: <20241014141239.486967178@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luis Henriques (SUSE) commit 972090651ee15e51abfb2160e986fa050cfc7a40 upstream. Function __jbd2_log_wait_for_space() assumes that '0' is not a valid value for transaction IDs, which is incorrect. Don't assume that and invoke jbd2_log_wait_commit() if the journal had a committing transaction instead. Signed-off-by: Luis Henriques (SUSE) Reviewed-by: Jan Kara Link: https://patch.msgid.link/20240724161119.13448-3-luis.henriques@linux.dev Signed-off-by: Theodore Ts'o Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/jbd2/checkpoint.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -91,9 +91,12 @@ __releases(&journal->j_state_lock) if (space_left < nblocks) { int chkpt = journal->j_checkpoint_transactions != NULL; tid_t tid = 0; + bool has_transaction = false; - if (journal->j_committing_transaction) + if (journal->j_committing_transaction) { tid = journal->j_committing_transaction->t_tid; + has_transaction = true; + } spin_unlock(&journal->j_list_lock); write_unlock(&journal->j_state_lock); if (chkpt) { @@ -101,7 +104,7 @@ __releases(&journal->j_state_lock) } else if (jbd2_cleanup_journal_tail(journal) == 0) { /* We were able to recover space; yay! */ ; - } else if (tid) { + } else if (has_transaction) { /* * jbd2_journal_commit_transaction() may want * to take the checkpoint_mutex if JBD2_FLUSHED