Zhigang Wang
2012-Feb-06 15:14 UTC
[PATCH] [PATCH] libxl: fix bootloader args setting [with diff]
# HG changeset patch
# User Zhigang Wang <zhigang.x.wang@oracle.com>
# Date 1328541193 18000
# Node ID 72f1296a55a470426e1c3e5b8b2ba907ab6eb78c
# Parent 3432abcf9380d3840ca38439a304f74a37d155fc
libxl: fix bootloader args setting
When bootloader_args = [''foo'', ''bar''], then
info->u.pv.bootloader_args
foo\0
bar\0
\0
Before this patch, ''p++'' points to the next character of
''foo\0'' and never
comes to ''bar\0'' (because of the ''\0'' in
''foo\0''), so the args will be:
args[0] = ''oo\0''
args[1] = ''o\0''
After this patch, ''p++'' points to the next string of
pv.bootloader_args, so we
get the correct args:
args[0] = ''foo\0''
args[1] = ''bar\0''
Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
diff -r 3432abcf9380 -r 72f1296a55a4 tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c Thu Feb 02 15:47:26 2012 +0000
+++ b/tools/libxl/libxl_bootloader.c Mon Feb 06 10:13:13 2012 -0500
@@ -49,9 +49,11 @@ static char **make_bootloader_args(libxl
flexarray_set(args, nr++, libxl__sprintf(gc,
"--output-directory=%s", "/var/run/libxl/"));
if (info->u.pv.bootloader_args) {
- char *p = info->u.pv.bootloader_args[0];
- while (*(p++))
- flexarray_set(args, nr++, p);
+ char **p = info->u.pv.bootloader_args;
+ while (*p) {
+ flexarray_set(args, nr++, *p);
+ p++;
+ }
}
flexarray_set(args, nr++, disk);
Ian Campbell
2012-Feb-08 13:44 UTC
Re: [PATCH] [PATCH] libxl: fix bootloader args setting [with diff]
On Mon, 2012-02-06 at 15:14 +0000, Zhigang Wang wrote:> # HG changeset patch > # User Zhigang Wang <zhigang.x.wang@oracle.com> > # Date 1328541193 18000 > # Node ID 72f1296a55a470426e1c3e5b8b2ba907ab6eb78c > # Parent 3432abcf9380d3840ca38439a304f74a37d155fc > libxl: fix bootloader args setting > > When bootloader_args = [''foo'', ''bar''], then info->u.pv.bootloader_args > > foo\0 > bar\0 > \0 > > Before this patch, ''p++'' points to the next character of ''foo\0'' and never > comes to ''bar\0'' (because of the ''\0'' in ''foo\0''), so the args will be: > > args[0] = ''oo\0'' > args[1] = ''o\0'' > > After this patch, ''p++'' points to the next string of pv.bootloader_args, so we > get the correct args: > > args[0] = ''foo\0'' > args[1] = ''bar\0'' > > Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>Acked-by: Ian Campbell <ian.campbell@citrix.com>> diff -r 3432abcf9380 -r 72f1296a55a4 tools/libxl/libxl_bootloader.c > --- a/tools/libxl/libxl_bootloader.c Thu Feb 02 15:47:26 2012 +0000 > +++ b/tools/libxl/libxl_bootloader.c Mon Feb 06 10:13:13 2012 -0500 > @@ -49,9 +49,11 @@ static char **make_bootloader_args(libxl > flexarray_set(args, nr++, libxl__sprintf(gc, "--output-directory=%s", "/var/run/libxl/")); > > if (info->u.pv.bootloader_args) { > - char *p = info->u.pv.bootloader_args[0]; > - while (*(p++)) > - flexarray_set(args, nr++, p); > + char **p = info->u.pv.bootloader_args; > + while (*p) { > + flexarray_set(args, nr++, *p); > + p++; > + } > } > > flexarray_set(args, nr++, disk); > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel