[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH] xen/cmdline: Fix buggy strncmp(s, LITERAL, ss - s) construct


  • To: Jan Beulich <JBeulich@xxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Fri, 4 Jan 2019 15:55:36 +0000
  • Autocrypt: addr=andrew.cooper3@xxxxxxxxxx; prefer-encrypt=mutual; keydata= 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 6+ahAA==
  • Cc: Julien Grall <julien.grall@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wei.liu2@xxxxxxxxxx>, Xen-devel <xen-devel@xxxxxxxxxxxxx>, Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Delivery-date: Fri, 04 Jan 2019 15:55:55 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Openpgp: preference=signencrypt

On 04/01/2019 15:32, Jan Beulich wrote:
>>>> On 31.12.18 at 18:35, <andrew.cooper3@xxxxxxxxxx> wrote:
>> --- a/xen/arch/x86/cpu/vpmu.c
>> +++ b/xen/arch/x86/cpu/vpmu.c
>> @@ -61,42 +61,31 @@ static unsigned vpmu_count;
>>  
>>  static DEFINE_PER_CPU(struct vcpu *, last_vcpu);
>>  
>> -static int parse_vpmu_param(const char *s, unsigned int len)
>> -{
>> -    if ( !*s || !len )
>> -        return 0;
>> -    if ( !strncmp(s, "bts", len) )
>> -        vpmu_features |= XENPMU_FEATURE_INTEL_BTS;
>> -    else if ( !strncmp(s, "ipc", len) )
>> -        vpmu_features |= XENPMU_FEATURE_IPC_ONLY;
>> -    else if ( !strncmp(s, "arch", len) )
>> -        vpmu_features |= XENPMU_FEATURE_ARCH_ONLY;
>> -    else
>> -        return 1;
>> -    return 0;
>> -}
>> -
>>  static int __init parse_vpmu_params(const char *s)
>>  {
>> -    const char *sep, *p = s;
>> +    const char *ss;
>>  
>>      switch ( parse_bool(s, NULL) )
>>      {
>>      case 0:
>>          break;
>>      default:
>> -        for ( ; ; )
>> -        {
>> -            sep = strchr(p, ',');
>> -            if ( sep == NULL )
>> -                sep = strchr(p, 0);
>> -            if ( parse_vpmu_param(p, sep - p) )
>> -                goto error;
>> -            if ( !*sep )
>> -                /* reached end of flags */
>> -                break;
>> -            p = sep + 1;
>> -        }
>> +        do {
>> +            ss = strchr(s, ',');
>> +            if ( !ss )
>> +                ss = strchr(s, '\0');
>> +
>> +            if ( !cmdline_strcmp(s, "bts") )
>> +                vpmu_features |= XENPMU_FEATURE_INTEL_BTS;
>> +            else if ( !cmdline_strcmp(s, "ipc") )
>> +                vpmu_features |= XENPMU_FEATURE_IPC_ONLY;
>> +            else if ( !cmdline_strcmp(s, "arch") )
>> +                vpmu_features |= XENPMU_FEATURE_ARCH_ONLY;
>> +            else
>> +                return -EINVAL;
>> +
>> +            s = ss + 1;
>> +        } while ( *ss );
> While presumably also applicable elsewhere, the issue is more
> noticeable here because you introduce "ss" anew:

I don't introduce it.  It was previously named "sep", which I renamed
for consistency.  It is also subtly disguised with a 0 instead of '\0'
and a redundant local variable named p.

> It is now
> unhelpful (in terms of generated code) to calculate ss before
> the various cmdline_strcmp() calls, as the compiler can't know
> (despite the const) that what s points to won't change across
> those calls, and hence has to calculate ss early (and put it into
> a callee saved register or on the stack), as written. If the
> calculation was pulled down, only scratch registers would
> suffice for the compiler to carry out the calculation.
>
> That said - all of this is boot time only code, so not really
> performance critical. It's just that this general structure will
> then further proliferate, and the overall binary size is likely
> going to be (slightly) larger this way.

TBH, I'm not concerned far more with code consistency than efficiency,
given how often we manage to subtly break the command line parsing.

If we do want to come up with a more efficient way of doing this, we can
do a blanket change to our prevailing style.

>
>> --- a/xen/common/kernel.c
>> +++ b/xen/common/kernel.c
>> @@ -227,19 +227,49 @@ int parse_bool(const char *s, const char *e)
>>      if ( !len )
>>          return -1;
>>  
>> -    if ( !strncmp("no", s, len) ||
>> -         !strncmp("off", s, len) ||
>> -         !strncmp("false", s, len) ||
>> -         !strncmp("disable", s, len) ||
>> -         !strncmp("0", s, len) )
>> -        return 0;
>> +    switch ( len )
>> +    {
>> +    case 1:
>> +        if ( *s == '1' )
>> +            return 1;
>> +        else if ( *s == '0' )
> The "else" here is pointless (also further down).

So they are.  I'll drop.

>
>> @@ -271,6 +301,29 @@ int parse_boolean(const char *name, const char *s, 
>> const char *e)
>>      return -1;
>>  }
>>  
>> +int cmdline_strcmp(const char *frag, const char *name)
>> +{
>> +    while ( 1 )
> Could I talk you into using "for ( ; ; )" instead (and then perhaps
> moving the two increments up here)? I know gcc doesn't do this,
> but in the general case a compiler warning about such constant
> conditionals is not an entirely bad or wrong thing, so I prefer to
> see such constructs avoided where we reasonably can.

Ok.

>
>> +    {
>> +        int res = (*frag - *name);
> With the result of this being implementation defined (due to plain
> char's implementation defined - often command line controlled
> with an implementation defined default - signedness) I wonder if
> this function can really usefully return "int" rather than "bool".

My CPUID command line parsing needs this to work properly as int, for
bisecting across a sorted list.

I'll add an explicit cast to signed char.  I'll also fix out local libc
functions, which are similarly buggy.

>
>> +        if ( res || *name == '\0' )
>> +        {
>> +            /*
>> +             * NUL in 'name' matching a comma or colon in 'frag' implies
>> +             * success.
>> +             */
>> +            if ( *name == '\0' && (*frag == ',' || *frag == ':') )
> There's only a single (unrelated) use of ; as a separator right
> now (afaics), but adding it here would seem quite desirable to
> me.

Where is ; used, out of interest?  I'm happy to add it, but I didn't
spot it on my audit.

> Also, speaking of (the lack of) tokenization of the command line
> in the caller, wouldn't it make sense to accept white space as
> separators here too?

I'm not sure if that is wise or not.  I can't think of a situation where
you would want that behaviour, rather than finding yourself with a
parsing bug and having to fix a bug elsewhere.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.