diff options
| author | William Dauchy <william@gandi.net> | 2015-10-31 14:11:29 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-11-02 12:06:00 +0000 |
| commit | d583df25ed1efca38c629612e3c5f703db41b2ad (patch) | |
| tree | 7b7ddb51442cf2887e6ca3be2effbb0bd789776a | |
| parent | 6d7eeb7a1328fcce82b5783d9e4605bf5e4737dd (diff) | |
| download | kvmtool-d583df25ed1efca38c629612e3c5f703db41b2ad.tar.gz | |
kvmtool/run: set a default cmdline if not set
when starting with custom kernel and disk options, kernel_cmdline is
NULL; it results in a segfault while trying to look for a string
using `strstr`:
__strstr_sse2_unaligned () at ../sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S:40
0x00000000004056bf in kvm_cmd_run_init (argc=<optimized out>, argv=<optimized out>) at builtin-run.c:608
0x000000000040639d in kvm_cmd_run (argc=<optimized out>, argv=<optimized out>, prefix=<optimized out>) at builtin-run.c:659
0x0000000000412b8f in handle_command (command=0x62bbc0 <kvm_commands>, argc=5, argv=0x7fffffffe840) at kvm-cmd.c:84
0x00007ffff7211b45 in __libc_start_main (main=0x403540 <main>, argc=6, argv=0x7fffffffe838, init=<optimized out>, fini=<optimized out>,
rtld_fini=<optimized out>, stack_end=0x7fffffffe828) at libc-start.c:287
0x0000000000403962 in _start ()
this patch suggests to set a minimal cmdline when kernel_cmdline is NULL
Fixes: 8a7163f3dbc7 ("kvmtool/run: append cfg.kernel_cmdline at the end of real_cmdline")
Signed-off-by: William Dauchy <william@gandi.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | builtin-run.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-run.c b/builtin-run.c index d7d3afd8..edcaf3ec 100644 --- a/builtin-run.c +++ b/builtin-run.c @@ -605,7 +605,7 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv) if (kvm_setup_guest_init(kvm->cfg.custom_rootfs_name)) die("Failed to setup init for guest."); } - } else if (!strstr(kvm->cfg.kernel_cmdline, "root=")) { + } else if (!kvm->cfg.kernel_cmdline || !strstr(kvm->cfg.kernel_cmdline, "root=")) { strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline)); } |