[PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Campbell]

Otherwise we deference a NULL pointer.

I saw this while experimenting with libvirt on Xen on ARM, xl already checks
that the command line is non NULL and provides "" as a default.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: george.dunlap@citrix.com>
---
This is a pretty obvious fix and would be nice to have if we are taking any
more fixes for other stuff , but otherwise I think we can leave to 4.4.1 quite
happily.
---
 tools/libxl/libxl_arm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index 0a1c8c5..0cfd0cf 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt,
     res = fdt_begin_node(fdt, "chosen");
     if (res) return res;
 
-    res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
-    if (res) return res;
+    if (info->u.pv.cmdline) {
+        res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
+        if (res) return res;
+    }
 
     res = fdt_end_node(fdt);
     if (res) return res;
-- 
1.7.10.4

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Campbell]

On Wed, 2014-02-26 at 12:13 +0000, Ian Campbell wrote:
> Otherwise we deference a NULL pointer.
> 
> I saw this while experimenting with libvirt on Xen on ARM, xl already checks
> that the command line is non NULL and provides "" as a default.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: george.dunlap@citrix.com>

Typo (extra ">") so Goerge's CC got missed out...

> ---
> This is a pretty obvious fix and would be nice to have if we are taking any
> more fixes for other stuff , but otherwise I think we can leave to 4.4.1 quite
> happily.
> ---
>  tools/libxl/libxl_arm.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
> index 0a1c8c5..0cfd0cf 100644
> --- a/tools/libxl/libxl_arm.c
> +++ b/tools/libxl/libxl_arm.c
> @@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt,
>      res = fdt_begin_node(fdt, "chosen");
>      if (res) return res;
>  
> -    res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
> -    if (res) return res;
> +    if (info->u.pv.cmdline) {
> +        res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
> +        if (res) return res;
> +    }
>  
>      res = fdt_end_node(fdt);
>      if (res) return res;

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[George Dunlap]

On 02/26/2014 12:14 PM, Ian Campbell wrote:
> On Wed, 2014-02-26 at 12:13 +0000, Ian Campbell wrote:
>> Otherwise we deference a NULL pointer.
>>
>> I saw this while experimenting with libvirt on Xen on ARM, xl already checks
>> that the command line is non NULL and provides "" as a default.
>>
>> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>> Cc: george.dunlap@citrix.com>
> Typo (extra ">") so Goerge's CC got missed out...

I'm not aware (yet) of anything that might make us delay the release.

  -George

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Julien Grall]

On 26/02/14 20:14, Ian Campbell wrote:
> On Wed, 2014-02-26 at 12:13 +0000, Ian Campbell wrote:
>> Otherwise we deference a NULL pointer.
>>
>> I saw this while experimenting with libvirt on Xen on ARM, xl already checks
>> that the command line is non NULL and provides "" as a default.
>>
>> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>> Cc: george.dunlap@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>

>
> Typo (extra ">") so Goerge's CC got missed out...
>
>> ---
>> This is a pretty obvious fix and would be nice to have if we are taking any
>> more fixes for other stuff , but otherwise I think we can leave to 4.4.1 quite
>> happily.
>> ---
>>   tools/libxl/libxl_arm.c |    6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
>> index 0a1c8c5..0cfd0cf 100644
>> --- a/tools/libxl/libxl_arm.c
>> +++ b/tools/libxl/libxl_arm.c
>> @@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt,
>>       res = fdt_begin_node(fdt, "chosen");
>>       if (res) return res;
>>
>> -    res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
>> -    if (res) return res;
>> +    if (info->u.pv.cmdline) {
>> +        res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
>> +        if (res) return res;
>> +    }
>>
>>       res = fdt_end_node(fdt);
>>       if (res) return res;
>
>

-- 
Julien Grall

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Campbell]

On Wed, 2014-02-26 at 12:14 +0000, Ian Campbell wrote:
> On Wed, 2014-02-26 at 12:13 +0000, Ian Campbell wrote:
> > Otherwise we deference a NULL pointer.
> > 
> > I saw this while experimenting with libvirt on Xen on ARM, xl already checks
> > that the command line is non NULL and provides "" as a default.
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > Cc: george.dunlap@citrix.com>
> 
> Typo (extra ">") so Goerge's CC got missed out...

Dropping George since 4.4 is out the door so I'm sure he doesn't care
any more.

Ping to the rest of you...

> 
> > ---
> > This is a pretty obvious fix and would be nice to have if we are taking any
> > more fixes for other stuff , but otherwise I think we can leave to 4.4.1 quite
> > happily.
> > ---
> >  tools/libxl/libxl_arm.c |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
> > index 0a1c8c5..0cfd0cf 100644
> > --- a/tools/libxl/libxl_arm.c
> > +++ b/tools/libxl/libxl_arm.c
> > @@ -164,8 +164,10 @@ static int make_chosen_node(libxl__gc *gc, void *fdt,
> >      res = fdt_begin_node(fdt, "chosen");
> >      if (res) return res;
> >  
> > -    res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
> > -    if (res) return res;
> > +    if (info->u.pv.cmdline) {
> > +        res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline);
> > +        if (res) return res;
> > +    }
> >  
> >      res = fdt_end_node(fdt);
> >      if (res) return res;
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Campbell]

On Thu, 2014-03-13 at 10:55 +0000, Ian Campbell wrote:
> On Wed, 2014-02-26 at 12:14 +0000, Ian Campbell wrote:
> > On Wed, 2014-02-26 at 12:13 +0000, Ian Campbell wrote:
> > > Otherwise we deference a NULL pointer.
> > > 
> > > I saw this while experimenting with libvirt on Xen on ARM, xl already checks
> > > that the command line is non NULL and provides "" as a default.
> > > 
> > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > > Cc: george.dunlap@citrix.com>
> > 
> > Typo (extra ">") so Goerge's CC got missed out...
> 
> Dropping George since 4.4 is out the door so I'm sure he doesn't care
> any more.
> 
> Ping to the rest of you...

Nevermind, I misfiled Julien's ack.

Ian.

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Campbell]

On Fri, 2014-02-28 at 23:18 +0800, Julien Grall wrote:
> 
> On 26/02/14 20:14, Ian Campbell wrote:
> > On Wed, 2014-02-26 at 12:13 +0000, Ian Campbell wrote:
> >> Otherwise we deference a NULL pointer.
> >>
> >> I saw this while experimenting with libvirt on Xen on ARM, xl already checks
> >> that the command line is non NULL and provides "" as a default.
> >>
> >> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> >> Cc: george.dunlap@citrix.com>
> Acked-by: Julien Grall <julien.grall@linaro.org>

Thanks, applied.

Ian -- please can you queue for 4.4.1.

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified"):
> Ian -- please can you queue for 4.4.1.

Queued.

Ian.

Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified

[Ian Jackson]

Ian Jackson writes ("Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified"):
> Ian Campbell writes ("Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified"):
> > Ian -- please can you queue for 4.4.1.
> 
> Queued.

Now pushed to staging-4.4.

Thanks.
Ian.