linux-ext4 - Re: [PATCH 2/2] ext2: create ext2_msg

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: <eyqjaiiytiuwuuf5gx2bk6oger2n6sxcco5gdbdxk4ciyk27lr@c4oxd73rg5ve>
Date: Mon, 24 Feb 2025 17:01:52 +0100
From: Jan Kara <jack@...e.cz>
To: Eric Sandeen <sandeen@...hat.com>
Cc: jack@...e.com, linux-ext4@...r.kernel.org
Subject: Re: [PATCH 2/2] ext2: create ext2_msg_fc for use during parsing

On Sun 23-02-25 13:57:41, Eric Sandeen wrote:
> Rather than send a NULL sb to ext2_msg, which omits the s_id from
> messages, create a new ext2_msg_fc which is able to provide this
> information from the filesystem context *fc when parsing.
> 
> Signed-off-by: Eric Sandeen <sandeen@...hat.com>
...
> +static void ext2_msg_fc(struct fs_context *fc, const char *prefix,
> +			const char *fmt, ...)
> +{
> +	struct va_format vaf;
> +	va_list args;
> +	const char *s_id;
> +
> +	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE) {
> +		s_id = fc->root->d_sb->s_id;

So the remount handling is definitely valuable...

> +	} else {
> +		/* get last path component of source */
> +		s_id = strrchr(fc->source, '/');
> +		if (s_id)
> +			s_id++;
> +	}

And this isn't too bad but I think it will crash if fc->source has no / in
it? I'll fix that up on commit.

Thanks for the patch!

								Honza

> +	va_start(args, fmt);
> +
> +	vaf.fmt = fmt;
> +	vaf.va = &args;
> +
> +	printk("%sEXT2-fs (%s): %pV\n", prefix, s_id, &vaf);
> +
> +	va_end(args);
> +}
> +
>  void ext2_msg(struct super_block *sb, const char *prefix,
>  		const char *fmt, ...)
>  {
> @@ -92,10 +117,7 @@ void ext2_msg(struct super_block *sb, const char *prefix,
>  	vaf.fmt = fmt;
>  	vaf.va = &args;
>  
> -	if (sb)
> -		printk("%sEXT2-fs (%s): %pV\n", prefix, sb->s_id, &vaf);
> -	else
> -		printk("%sEXT2-fs: %pV\n", prefix, &vaf);
> +	printk("%sEXT2-fs (%s): %pV\n", prefix, sb->s_id, &vaf);
>  
>  	va_end(args);
>  }
> @@ -544,7 +566,7 @@ static int ext2_parse_param(struct fs_context *fc, struct fs_parameter *param)
>  		ctx_clear_mount_opt(ctx, EXT2_MOUNT_OLDALLOC);
>  		break;
>  	case Opt_nobh:
> -		ext2_msg(NULL, KERN_INFO, "nobh option not supported\n");
> +		ext2_msg_fc(fc, KERN_INFO, "nobh option not supported\n");
>  		break;
>  #ifdef CONFIG_EXT2_FS_XATTR
>  	case Opt_user_xattr:
> @@ -555,7 +577,7 @@ static int ext2_parse_param(struct fs_context *fc, struct fs_parameter *param)
>  		break;
>  #else
>  	case Opt_user_xattr:
> -		ext2_msg(NULL, KERN_INFO, "(no)user_xattr options not supported");
> +		ext2_msg_fc(fc, KERN_INFO, "(no)user_xattr options not supported");
>  		break;
>  #endif
>  #ifdef CONFIG_EXT2_FS_POSIX_ACL
> @@ -567,20 +589,20 @@ static int ext2_parse_param(struct fs_context *fc, struct fs_parameter *param)
>  		break;
>  #else
>  	case Opt_acl:
> -		ext2_msg(NULL, KERN_INFO, "(no)acl options not supported");
> +		ext2_msg_fc(fc, KERN_INFO, "(no)acl options not supported");
>  		break;
>  #endif
>  	case Opt_xip:
> -		ext2_msg(NULL, KERN_INFO, "use dax instead of xip");
> +		ext2_msg_fc(fc, KERN_INFO, "use dax instead of xip");
>  		ctx_set_mount_opt(ctx, EXT2_MOUNT_XIP);
>  		fallthrough;
>  	case Opt_dax:
>  #ifdef CONFIG_FS_DAX
> -		ext2_msg(NULL, KERN_WARNING,
> +		ext2_msg_fc(fc, KERN_WARNING,
>  		    "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
>  		ctx_set_mount_opt(ctx, EXT2_MOUNT_DAX);
>  #else
> -		ext2_msg(NULL, KERN_INFO, "dax option not supported");
> +		ext2_msg_fc(fc, KERN_INFO, "dax option not supported");
>  #endif
>  		break;
>  
> @@ -597,16 +619,16 @@ static int ext2_parse_param(struct fs_context *fc, struct fs_parameter *param)
>  	case Opt_quota:
>  	case Opt_usrquota:
>  	case Opt_grpquota:
> -		ext2_msg(NULL, KERN_INFO, "quota operations not supported");
> +		ext2_msg_fc(fc, KERN_INFO, "quota operations not supported");
>  		break;
>  #endif
>  	case Opt_reservation:
>  		if (!result.negated) {
>  			ctx_set_mount_opt(ctx, EXT2_MOUNT_RESERVATION);
> -			ext2_msg(NULL, KERN_INFO, "reservations ON");
> +			ext2_msg_fc(fc, KERN_INFO, "reservations ON");
>  		} else {
>  			ctx_clear_mount_opt(ctx, EXT2_MOUNT_RESERVATION);
> -			ext2_msg(NULL, KERN_INFO, "reservations OFF");
> +			ext2_msg_fc(fc, KERN_INFO, "reservations OFF");
>  		}
>  		break;
>  	case Opt_ignore:
> -- 
> 2.48.0
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR