linux-ext4 - Re: [PATCH v2 1/2] e2fsck: allow to check >2GB sized directory

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] [thread-next>] [day] [month] [year] [list]

Message-Id: <CA49E193-ADAA-4D69-8378-D35BEF0B72C5@dilger.ca>
Date:   Wed, 30 Jan 2019 10:58:59 -0700
From:   Andreas Dilger <adilger@...ger.ca>
To:     Artem Blagodarenko <artem.blagodarenko@...il.com>
Cc:     Ext4 Developers List <linux-ext4@...r.kernel.org>
Subject: Re: [PATCH v2 1/2] e2fsck: allow to check >2GB sized directory

On Dec 14, 2018, at 12:50 AM, Artem Blagodarenko <artem.blagodarenko@...il.com> wrote:
> 
> After large_dir feature has been added, e2fsprogs is
> ready for directories > 2GB, so we can remove e2fsck
> directory size check.
> 
> Signed-off-by: Artem Blagodarenko <artem.blagodarenko@...il.com>

Reviewed-by: Andreas Dilger <adilger@...ger.ca>

> ---
> e2fsck/pass1.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
> index 5c0b92d5..5c413610 100644
> --- a/e2fsck/pass1.c
> +++ b/e2fsck/pass1.c
> @@ -3647,9 +3647,12 @@ static int process_block(ext2_filsys fs,
> 		}
> 	}
> 
> -	if (p->is_dir && blockcnt > (1 << (21 - fs->super->s_log_block_size)))
> +	if (p->is_dir && !ext2fs_has_feature_largedir(fs->super) &&
> +	    blockcnt > (1 << (21 - fs->super->s_log_block_size)))
> 		problem = PR_1_TOOBIG_DIR;
> -	if (p->is_reg && p->num_blocks+1 >= p->max_blocks)
> +	if (p->is_dir && p->num_blocks + 1 >= p->max_blocks)
> +		problem = PR_1_TOOBIG_DIR;
> +	if (p->is_reg && p->num_blocks + 1 >= p->max_blocks)
> 		problem = PR_1_TOOBIG_REG;
> 	if (!p->is_dir && !p->is_reg && blockcnt > 0)
> 		problem = PR_1_TOOBIG_SYMLINK;
> --
> 2.14.3
> 


Cheers, Andreas






Download attachment "signature.asc" of type "application/pgp-signature" (874 bytes)