From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH] libxl: arm: do not create /chosen/bootargs in DTB if no cmdline is specified Date: Fri, 28 Feb 2014 23:18:41 +0800 Message-ID: <5310A8D1.6010501@linaro.org> References: <1393416780-10912-1-git-send-email-ian.campbell@citrix.com> <1393416841.18730.38.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1393416841.18730.38.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell , xen-devel@lists.xen.org Cc: George Dunlap , ian.jackson@eu.citrix.com, tim@xen.org, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org 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 >> Cc: george.dunlap@citrix.com> Acked-by: Julien Grall > > 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