linux-ext4 - Re: [PATCH] e2fsck: fix quota accounting to use cluster units

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]

Date:   Tue, 4 Apr 2017 21:03:53 +0300
From:   Alexey Lyashkov <alexey.lyashkov@...il.com>
To:     Eric Whitney <enwlinux@...il.com>
Cc:     linux-ext4 <linux-ext4@...r.kernel.org>, tytso@....edu
Subject: Re: [PATCH] e2fsck: fix quota accounting to use cluster units

Hi Eric,

> 2 апр. 2017 г., в 19:57, Eric Whitney <enwlinux@...il.com> написал(а):
> 
> The quota accounting code in e2fsck's pass 1 and pass 3 uses block units
> rather than cluster units when recording the allocated space consumed by
> files and directories.  In pass 1, this causes a large undercount of
> actual quota results and test failures for xfstests generic/383, /384,
> /385, and /386 on bigalloc file systems.  In pass 3, this results in
> quota accounting errors when the lost+found directory is either extended
> or recreated on a bigalloc file system.
> 
> Use clusters rather than blocks when accounting for allocated space,
> and correct a related header comment in the quota code.
> 
> Note that pass 1b also contains call sites for quota_data_sub() that
> also need to be addressed.  However, it appears that more than just
> unit conversion may be needed, so that will be left to a future patch.
> 
> Signed-off-by: Eric Whitney <enwlinux@...il.com>
> ---
> e2fsck/pass1.c        | 3 ++-
> e2fsck/pass3.c        | 5 +++--
> lib/support/quotaio.h | 2 +-
> 3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
> index 1714897..188cc56 100644
> --- a/e2fsck/pass1.c
> +++ b/e2fsck/pass1.c
> @@ -3174,7 +3174,8 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
> 	if (ino != quota_type2inum(PRJQUOTA, fs->super) &&
> 	    (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super))) {
> 		quota_data_add(ctx->qctx, (struct ext2_inode_large *) inode,
> -			       ino, pb.num_blocks * fs->blocksize);
> +			       ino,
> +			       pb.num_blocks * EXT2_CLUSTER_SIZE(fs->super));
> 		quota_data_inodes(ctx->qctx, (struct ext2_inode_large *) inode,
> 				  ino, +1);
> 	}
I think it part may rewrite easy.

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 98125bf..cd83156 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2700,6 +2700,8 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
               }
       }

+       pb.num_blocks *= EXT2FS_CLUSTER_RATIO(fs);
+
       if (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super)) {
               quota_data_add(ctx->qctx, inode, ino,
                              pb.num_blocks * fs->blocksize);
@@ -2710,7 +2712,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
             EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
           !(inode->i_flags & EXT4_HUGE_FILE_FL))
               pb.num_blocks *= (fs->blocksize / 512);
-       pb.num_blocks *= EXT2FS_CLUSTER_RATIO(fs);
+