lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240724163102.gbmw6h3g7jrgsqft@quack3>
Date: Wed, 24 Jul 2024 18:31:02 +0200
From: Jan Kara <jack@...e.cz>
To: "Luis Henriques (SUSE)" <luis.henriques@...ux.dev>
Cc: Theodore Ts'o <tytso@....edu>, Andreas Dilger <adilger@...ger.ca>,
	Jan Kara <jack@...e.cz>,
	Harshad Shirwadkar <harshadshirwadkar@...il.com>,
	linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 3/4] ext4: fix incorrect tid assumption in
 jbd2_journal_shrink_checkpoint_list()

On Wed 24-07-24 17:11:17, Luis Henriques (SUSE) wrote:
> Function jbd2_journal_shrink_checkpoint_list() assumes that '0' is not a
> valid value for transaction IDs, which is incorrect.  Don't assume that and
> use two extra boolean variables to control the loop iterations and keep
> track of the first and last tid.
> 
> Signed-off-by: Luis Henriques (SUSE) <luis.henriques@...ux.dev>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@...e.cz>

								Honza

> ---
>  fs/jbd2/checkpoint.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
> index 77bc522e6821..98a0b2eb84f5 100644
> --- a/fs/jbd2/checkpoint.c
> +++ b/fs/jbd2/checkpoint.c
> @@ -410,6 +410,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
>  	tid_t tid = 0;
>  	unsigned long nr_freed = 0;
>  	unsigned long freed;
> +	bool first_set = false;
>  
>  again:
>  	spin_lock(&journal->j_list_lock);
> @@ -429,8 +430,10 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
>  	else
>  		transaction = journal->j_checkpoint_transactions;
>  
> -	if (!first_tid)
> +	if (!first_set) {
>  		first_tid = transaction->t_tid;
> +		first_set = true;
> +	}
>  	last_transaction = journal->j_checkpoint_transactions->t_cpprev;
>  	next_transaction = transaction;
>  	last_tid = last_transaction->t_tid;
> @@ -460,7 +463,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
>  	spin_unlock(&journal->j_list_lock);
>  	cond_resched();
>  
> -	if (*nr_to_scan && next_tid)
> +	if (*nr_to_scan && journal->j_shrink_transaction)
>  		goto again;
>  out:
>  	trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid,
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ