linux-kernel - Re: [PATCH v7 3/4] lib/cmdline.c Remove quotes symmetrically.

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:   Thu, 24 Aug 2017 14:15:20 +0200
From:   msuchanek <msuchanek@...e.de>
To:     Michael Ellerman <mpe@...erman.id.au>
Cc:     Benjamin Herrenschmidt <benh@...nel.crashing.org>,
        Paul Mackerras <paulus@...ba.org>,
        Jonathan Corbet <corbet@....net>, Jessica Yu <jeyu@...nel.org>,
        Rusty Russell <rusty@...tcorp.com.au>,
        Jason Baron <jbaron@...mai.com>,
        Hari Bathini <hbathini@...ux.vnet.ibm.com>,
        Mahesh J Salgaonkar <mahesh@...ux.vnet.ibm.com>,
        Daniel Axtens <dja@...ens.net>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Thiago Jung Bauermann <bauerman@...ux.vnet.ibm.com>,
        Balbir Singh <bsingharora@...il.com>,
        Nicholas Piggin <npiggin@...il.com>,
        Michael Neuling <mikey@...ling.org>,
        "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>,
        Christophe Leroy <christophe.leroy@....fr>,
        Scott Wood <oss@...error.net>,
        Oliver O'Halloran <oohall@...il.com>,
        David Howells <dhowells@...hat.com>,
        Sylvain 'ythier' Hitier <sylvain.hitier@...il.com>,
        Ingo Molnar <mingo@...nel.org>,
        Kees Cook <keescook@...omium.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Baoquan He <bhe@...hat.com>, linux-doc@...r.kernel.org,
        Lokesh Vutla <lokeshvutla@...com>,
        Viresh Kumar <viresh.kumar@...aro.org>,
        linux-kernel@...r.kernel.org,
        "Steven Rostedt, " <rostedt@...dmis.org>,
        Tejun Heo <tj@...nel.org>,
        Ilya Matveychikov <matvejchikov@...il.com>,
        linuxppc-dev@...ts.ozlabs.org
Subject: Re: [PATCH v7 3/4] lib/cmdline.c Remove quotes symmetrically.

On Thu, 24 Aug 2017 21:02:47 +1000
Michael Ellerman <mpe@...erman.id.au> wrote:

> Michal Suchanek <msuchanek@...e.de> writes:
> 
> > Remove quotes from argument value only if there is qoute on both
> > sides.
> >
> > Signed-off-by: Michal Suchanek <msuchanek@...e.de>
> > ---
> >  arch/powerpc/kernel/fadump.c | 6 ++----
> >  lib/cmdline.c                | 7 ++-----  
> 
> Can you split that into two patches?

Not really. There is logic in lib/cmdline.c which is duplicated in
arch/powerpc/kernel/fadump.c and so the two places should be updated in
sync. 

Thanks

Michal

> 
> cheers
> 
> >  2 files changed, 4 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/powerpc/kernel/fadump.c
> > b/arch/powerpc/kernel/fadump.c index a1614d9b8a21..d7da4ce9f7ae
> > 100644 --- a/arch/powerpc/kernel/fadump.c
> > +++ b/arch/powerpc/kernel/fadump.c
> > @@ -489,10 +489,8 @@ static void __init fadump_update_params(struct
> > param_info *param_info, *tgt++ = ' ';
> >  
> >  	/* next_arg removes one leading and one trailing '"' */
> > -	if (*tgt == '"')
> > -		shortening += 1;
> > -	if (*(tgt + vallen + shortening) == '"')
> > -		shortening += 1;
> > +	if ((*tgt == '"') && (*(tgt + vallen + shortening) == '"'))
> > +		shortening += 2;
> >  
> >  	/* remove one leading and one trailing quote if both are
> > present */ if ((val[0] == '"') && (val[vallen - 1] == '"')) {
> > diff --git a/lib/cmdline.c b/lib/cmdline.c
> > index 4c0888c4a68d..01e701b2afe8 100644
> > --- a/lib/cmdline.c
> > +++ b/lib/cmdline.c
> > @@ -227,14 +227,11 @@ char *next_arg(char *args, char **param, char
> > **val) *val = args + equals + 1;
> >  
> >  		/* Don't include quotes in value. */
> > -		if (**val == '"') {
> > +		if ((**val == '"') && (args[i-1] == '"')) {
> >  			(*val)++;
> > -			if (args[i-1] == '"')
> > -				args[i-1] = '\0';
> > +			args[i-1] = '\0';
> >  		}
> >  	}
> > -	if (quoted && args[i-1] == '"')
> > -		args[i-1] = '\0';
> >  
> >  	if (args[i]) {
> >  		args[i] = '\0';
> > -- 
> > 2.10.2