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 59C591C4631; Tue, 8 Oct 2024 12:31:06 +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=1728390666; cv=none; b=fSwzukASlSKeVkUc4t12HLzsXN0X9Sm8ZVxkEazW2O9hzKJrp7Zzzv+fsQxJ2ITbe0v+2SfTwlHofvVxpyQX6/V6IZD1qB1FFptvIn8E0fdPa3Lyg4EOF9RKcS7mXbS5ZmDki84dbGhtdSszuW/zTbUvPMEKHYY6s1WYP7JOips= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728390666; c=relaxed/simple; bh=ZitO5Usn//aEvDpXTlAqqddFSEZVxKt4LEDZ/ltUhWQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bJMeTC6woqJy3Ax0fvwHVJM6dDrCRdFbm86E+7jW5z50VUwSnZdWEM2fbKU9NGkpT5UESOdfS8T7Kb/Qvo8FY9bUcQH0nn7UnbAeoc5r9qGbJFW5kWrBB+YpHp+Az552aBfXiP89pbHTqaPRXljpkESv9vfNtc159fHallKD0zk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I/jC0SBY; 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="I/jC0SBY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CA07C4CEC7; Tue, 8 Oct 2024 12:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728390665; bh=ZitO5Usn//aEvDpXTlAqqddFSEZVxKt4LEDZ/ltUhWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I/jC0SBYOVymoEOF88i1i3oO8h1zvM4mde2+fRhx35a/fpjU+UMzJ6QbSlEZmSY9m iYzZbsi3uuRgJDQQZDo+r4CEef/cHGFa74jRv1qjydZfr0nrCNXTpGm4xJ6pc7PiOG CnW9mrJobhKT+qAAvZ5trlXHSkzaOaBHsq+ygF8Y= 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.10 328/482] ext4: fix incorrect tid assumption in __jbd2_log_wait_for_space() Date: Tue, 8 Oct 2024 14:06:31 +0200 Message-ID: <20241008115701.335233148@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115648.280954295@linuxfoundation.org> References: <20241008115648.280954295@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.10-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 @@ -79,9 +79,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) { @@ -89,7 +92,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