From mboxrd@z Thu Jan  1 00:00:00 1970
From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Subject: Re: [PATCH] vsprintf: Make sure argument to %*ph/%pv is
 valid
Date: Tue, 10 Feb 2015 16:55:00 -0500
Message-ID: <54DA7E34.9050203@oracle.com>
References: <1423604687-3586-1-git-send-email-boris.ostrovsky@oracle.com>
	<54DA7CEC.9070308@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <54DA7CEC.9070308@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Andrew Cooper <andrew.cooper3@citrix.com>, ian.campbell@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, keir@xen.org, tim@xen.org
Cc: xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On 02/10/2015 04:49 PM, Andrew Cooper wrote:
> On 10/02/2015 21:44, Boris Ostrovsky wrote:
>> If NULL pointer is passed for these specifiers then print '-'
>> or 'd-v-'.
>>
>> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Instead of special casing each custom format, I would be tempted just to
> put the switch() in an if(arg) conditional, and fall back to the regular
> number for a NULL pointer, or go along the glibc route and print "(NULL)".

OK, I could do that.

>
> I presume you found this by falling over a NULL  pointer while
> debugging?  I can't see a legitimate reason for formally supporting NULL
> pointers in each context, but crashing is certainly better avoided.

Yes, I hit %pv case when the vcpu I was tracking turned NULL. And yes, 
we then crash.

-boris

>
> ~Andrew
>
>> ---
>>   xen/common/vsprintf.c |   19 +++++++++++++++++++
>>   1 files changed, 19 insertions(+), 0 deletions(-)
>>
>> diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c
>> index 065cc42..84cfa85 100644
>> --- a/xen/common/vsprintf.c
>> +++ b/xen/common/vsprintf.c
>> @@ -280,6 +280,13 @@ static char *pointer(char *str, char *end, const char **fmt_ptr,
>>           /* Consumed 'h' from the format string. */
>>           ++*fmt_ptr;
>>   
>> +        if ( hex_buffer == NULL )
>> +        {
>> +            if ( str < end )
>> +                *str++ = '-';
>> +            return str;
>> +        }
>> +
>>           /* Bound user count from %* to between 0 and 64 bytes. */
>>           if ( field_width <= 0 )
>>               return str;
>> @@ -338,6 +345,18 @@ static char *pointer(char *str, char *end, const char **fmt_ptr,
>>           ++*fmt_ptr;
>>           if ( str < end )
>>               *str = 'd';
>> +        if ( v == NULL )
>> +        {
>> +            /* If v is NULL then print 'd-v-' */
>> +            str++;
>> +            if ( str < end )
>> +                *str++ = '-';
>> +            if ( str < end )
>> +                *str++ = 'v';
>> +            if ( str < end )
>> +                *str++ = '-';
>> +            return str;
>> +        }
>>           str = number(str + 1, end, v->domain->domain_id, 10, -1, -1, 0);
>>           if ( str < end )
>>               *str = 'v';