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: <098B73D9-5D47-48A0-91F9-EACD1E1581ED@dilger.ca>
Date: Mon, 1 Apr 2024 13:52:07 -0600
From: Andreas Dilger <adilger@...ger.ca>
To: "Luis Henriques (SUSE)" <luis.henriques@...ux.dev>
Cc: Theodore Ts'o <tytso@....edu>,
 linux-ext4@...r.kernel.org
Subject: Re: [PATCH 1/4] e2fsck: update quota accounting after directory
 optimization

On Mar 28, 2024, at 11:29 AM, Luis Henriques (SUSE) <luis.henriques@...ux.dev> wrote:
> 
> In "Pass 3A: Optimizing directories", a directory may have it's size reduced.
> If that happens and quota is enabled in the filesystem, the quota information
> will be incorrect because it doesn't take the rehash into account.  This issue
> was detected by running fstest ext4/014.
> 
> This patch simply updates the quota data accordingly, after the directory is
> written and it's size has been updated.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=218626
> Signed-off-by: Luis Henriques (SUSE) <luis.henriques@...ux.dev>

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

> ---
> e2fsck/rehash.c | 27 +++++++++++++++++++++------
> 1 file changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
> index c1da7d52724e..4847d172e5fe 100644
> --- a/e2fsck/rehash.c
> +++ b/e2fsck/rehash.c
> @@ -987,14 +987,18 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino,
> {
> 	ext2_filsys 		fs = ctx->fs;
> 	errcode_t		retval;
> -	struct ext2_inode 	inode;
> +	struct ext2_inode_large	inode;
> 	char			*dir_buf = 0;
> 	struct fill_dir_struct	fd = { NULL, NULL, 0, 0, 0, NULL,
> 				       0, 0, 0, 0, 0, 0 };
> 	struct out_dir		outdir = { 0, 0, 0, 0 };
> -	struct name_cmp_ctx name_cmp_ctx = {0, NULL};
> +	struct name_cmp_ctx	name_cmp_ctx = {0, NULL};
> +	__u64			osize;
> 
> -	e2fsck_read_inode(ctx, ino, &inode, "rehash_dir");
> +	e2fsck_read_inode_full(ctx, ino, EXT2_INODE(&inode),
> +			       sizeof(inode), "rehash_dir");
> +
> +	osize = EXT2_I_SIZE(&inode);
> 
> 	if (ext2fs_has_feature_inline_data(fs->super) &&
> 	   (inode.i_flags & EXT4_INLINE_DATA_FL))
> @@ -1013,7 +1017,7 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino,
> 	fd.ino = ino;
> 	fd.ctx = ctx;
> 	fd.buf = dir_buf;
> -	fd.inode = &inode;
> +	fd.inode = EXT2_INODE(&inode);
> 	fd.dir = ino;
> 	if (!ext2fs_has_feature_dir_index(fs->super) ||
> 	    (inode.i_size / fs->blocksize) < 2)
> @@ -1092,14 +1096,25 @@ resort:
> 			goto errout;
> 	}
> 
> -	retval = write_directory(ctx, fs, &outdir, ino, &inode, fd.compress);
> +	retval = write_directory(ctx, fs, &outdir, ino, EXT2_INODE(&inode),
> +				 fd.compress);
> 	if (retval)
> 		goto errout;
> 
> +	if ((osize > EXT2_I_SIZE(&inode)) &&
> +	    (ino != quota_type2inum(PRJQUOTA, fs->super)) &&
> +	    (ino != fs->super->s_orphan_file_inum) &&
> +	    (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super)) &&
> +	    !(inode.i_flags & EXT4_EA_INODE_FL)) {
> +		quota_data_sub(ctx->qctx, &inode,
> +			       ino, osize - EXT2_I_SIZE(&inode));
> +	}
> +
> 	if (ctx->options & E2F_OPT_CONVERT_BMAP)
> 		retval = e2fsck_rebuild_extents_later(ctx, ino);
> 	else
> -		retval = e2fsck_check_rebuild_extents(ctx, ino, &inode, pctx);
> +		retval = e2fsck_check_rebuild_extents(ctx, ino,
> +						      EXT2_INODE(&inode), pctx);
> errout:
> 	ext2fs_free_mem(&dir_buf);
> 	ext2fs_free_mem(&fd.harray);


Cheers, Andreas






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

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ