linux-ext4 - Re: [PATCH v3 11/13] ext4: change token2str() to use ext4_param

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:   Wed, 27 Oct 2021 13:52:46 +0200
From:   Lukas Czerner <lczerner@...hat.com>
To:     linux-ext4@...r.kernel.org, tytso@....edu,
        linux-fsdevel@...r.kernel.org, cmaiolino@...hat.com
Subject: Re: [PATCH v3 11/13] ext4: change token2str() to use ext4_param_specs

On Tue, Oct 26, 2021 at 02:09:53PM +0200, Lukas Czerner wrote:
> On Tue, Oct 26, 2021 at 01:40:43PM +0200, Carlos Maiolino wrote:
> > On Thu, Oct 21, 2021 at 01:45:06PM +0200, Lukas Czerner wrote:
> > > Chage token2str() to use ext4_param_specs instead of tokens so that we
> > 
> > ^ Change.
> > 
> > > can get rid of tokens entirely.
> > 
> > If you're removing tokens entirely, maybe the name token2str() doesn't make
> > sense anymore?
> 
> True, I guess it's no longer called "token" so maybe option2str() ?

Actually it's still called token in the struct mount_opts which is what
we're passing down to the token2str() anyway. Since this really is
inconsequential stuff I'll leave it as it is.

-Lukas

> 
> -Lukas
> 
> > 
> > > 
> > > Signed-off-by: Lukas Czerner <lczerner@...hat.com>
> > > ---
> > >  fs/ext4/super.c | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> > > index bdcaa158eab8..0ccd47f3fa91 100644
> > > --- a/fs/ext4/super.c
> > > +++ b/fs/ext4/super.c
> > > @@ -3037,12 +3037,12 @@ static inline void ext4_show_quota_options(struct seq_file *seq,
> > >  
> > >  static const char *token2str(int token)
> > >  {
> > > -	const struct match_token *t;
> > > +	const struct fs_parameter_spec *spec;
> > >  
> > > -	for (t = tokens; t->token != Opt_err; t++)
> > > -		if (t->token == token && !strchr(t->pattern, '='))
> > > +	for (spec = ext4_param_specs; spec->name != NULL; spec++)
> > > +		if (spec->opt == token && !spec->type)
> > >  			break;
> > > -	return t->pattern;
> > > +	return spec->name;
> > >  }
> > >  
> > >  /*
> > > -- 
> > > 2.31.1
> > > 
> > 
> > -- 
> > Carlos
> > 
>