linux-kernel - Re: [PATCH v5 1/2] ext4: commit super block if fs record error when journal record without error

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]

Message-ID: <0f0ac9eb-1432-a61f-717f-88bd3d6fa7fc@huawei.com>
Date:   Wed, 8 Mar 2023 09:04:18 +0800
From:   Baokun Li <libaokun1@...wei.com>
To:     Ye Bin <yebin@...weicloud.com>, <tytso@....edu>,
        <adilger.kernel@...ger.ca>, <linux-ext4@...r.kernel.org>
CC:     <linux-kernel@...r.kernel.org>, <jack@...e.cz>,
        Ye Bin <yebin10@...wei.com>
Subject: Re: [PATCH v5 1/2] ext4: commit super block if fs record error when
 journal record without error

On 2023/3/7 14:17, Ye Bin wrote:
> From: Ye Bin <yebin10@...wei.com>
>
> Now, 'es->s_state' maybe covered by recover journal. And journal errno
> maybe not recorded in journal sb as IO error. ext4_update_super() only
> update error information when 'sbi->s_add_error_count' large than zero.
> Then 'EXT4_ERROR_FS' flag maybe lost.
> To solve above issue just recover 'es->s_state' error flag after journal
> replay like error info.
>
> Signed-off-by: Ye Bin <yebin10@...wei.com>



Looks good to me.

Reviewed-by: Baokun Li <libaokun1@...wei.com>


> ---
>   fs/ext4/super.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 88f7b8a88c76..dfa31eea1346 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -5920,6 +5920,7 @@ static int ext4_load_journal(struct super_block *sb,
>   		err = jbd2_journal_wipe(journal, !really_read_only);
>   	if (!err) {
>   		char *save = kmalloc(EXT4_S_ERR_LEN, GFP_KERNEL);
> +
>   		if (save)
>   			memcpy(save, ((char *) es) +
>   			       EXT4_S_ERR_START, EXT4_S_ERR_LEN);
> @@ -5928,6 +5929,14 @@ static int ext4_load_journal(struct super_block *sb,
>   			memcpy(((char *) es) + EXT4_S_ERR_START,
>   			       save, EXT4_S_ERR_LEN);
>   		kfree(save);
> +		es->s_state |= cpu_to_le16(EXT4_SB(sb)->s_mount_state &
> +					   EXT4_ERROR_FS);
> +		/* Write out restored error information to the superblock */
> +		if (!bdev_read_only(sb->s_bdev)) {
> +			int err2;
> +			err2 = ext4_commit_super(sb);
> +			err = err ? : err2;
> +		}
>   	}
>   
>   	if (err) {
-- 
With Best Regards,
Baokun Li
.