linux-ext4 - Re: [PATCH] jbd2: Make jbd2_handle_buffer

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: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 18 Nov 2019 13:29:21 +0530
From:   Ritesh Harjani <riteshh@...ux.ibm.com>
To:     Jan Kara <jack@...e.cz>, Ted Tso <tytso@....edu>
Cc:     linux-ext4@...r.kernel.org, Eric Biggers <ebiggers@...nel.org>
Subject: Re: [PATCH] jbd2: Make jbd2_handle_buffer_credits() handle reserved
 handles



On 11/15/19 3:52 PM, Jan Kara wrote:
> The helper jbd2_handle_buffer_credits() doesn't correctly handle reserved
> handles which can lead to crashes. Fix it getting of journal pointer to
> work for reserved handles as well.
> 
> Fixes: a9a8344ee171 ("ext4, jbd2: Provide accessor function for handle credits")
> Reported-by: Eric Biggers <ebiggers@...nel.org>
> Signed-off-by: Jan Kara <jack@...e.cz>

Thanks Jan,
Yes, this also fixes the problem for me with dioread_nolock on ppc64 
machine.

You may add -

Tested-by: Ritesh Harjani <riteshh@...ux.ibm.com>


> ---
>   include/linux/jbd2.h | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index 3115eeb44039..a23a3528e07a 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1648,10 +1648,14 @@ static inline tid_t  jbd2_get_latest_transaction(journal_t *journal)
>   	return tid;
>   }
> 
> -
>   static inline int jbd2_handle_buffer_credits(handle_t *handle)
>   {
> -	journal_t *journal = handle->h_transaction->t_journal;
> +	journal_t *journal;
> +
> +	if (!handle->h_reserved)
> +		journal = handle->h_transaction->t_journal;
> +	else
> +		journal = handle->h_journal;
> 
>   	return handle->h_total_credits -
>   		DIV_ROUND_UP(handle->h_revoke_credits_requested,
>