qemu_opts_parse(): always check return value
PATCH 1/1 qemu_opts_parse(): always check return value
qemu_opts_parse() can always return NULL, even if the QemuOptsList.desc in question would be trivial to satisfy (eg. because it's empty). For example:
qemu_opts_parse()
opts_parse()
qemu_opts_create()
id_wellformed()
In practice:
$ .../qemu-system-x86_64 -acpitable id=3 qemu-system-x86_64: -acpitable id=3: Parameter 'id' expects an identifier ** ERROR:vl.c:3491:main: assertion failed: (opts != NULL) Aborted (core dumped)
$ .../qemu-system-x86_64 -smbios id=3 qemu-system-x86_64: -smbios id=3: Parameter 'id' expects an identifier Segmentation fault (core dumped)
I checked all qemu_opts_parse() invocations (and all drive_def() invocations too, because it blindly forwards the former's retval). Only the two above examples look problematic.
--- vl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
vl.c +6 -1
@@ -3488,11 +3488,16 @@ int main(int argc, char **argv, char **envp) }case QEMU_OPTION_acpitable: opts =qemu_opts_parse (qemu_find_opts ("acpi" ), optarg,1 ); -g_assert (opts !=NULL ); +if (!opts) { +exit (1 ); + }do_acpitable_option (opts);break ;case QEMU_OPTION_smbios: opts =qemu_opts_parse (qemu_find_opts ("smbios" ), optarg,0 ); +if (!opts) { +exit (1 ); + }do_smbios_option (opts);break ;case QEMU_OPTION_enable_kvm:
Signature · 1 line
1.8.3.1
Quoted 21 lines · Laszlo Ersek
qemu_opts_parse()can always return NULL, even if the QemuOptsList.desc in question would be trivial to satisfy (eg. because it's empty). For example:
qemu_opts_parse()
opts_parse()
qemu_opts_create()
id_wellformed()In practice:
$ .../qemu-system-x86_64 -acpitable id=3 qemu-system-x86_64: -acpitable id=3: Parameter 'id' expects an identifier ** ERROR:vl.c:3491:main: assertion failed: (opts != NULL) Aborted (core dumped)$ .../qemu-system-x86_64 -smbios id=3 qemu-system-x86_64: -smbios id=3: Parameter 'id' expects an identifier Segmentation fault (core dumped)
Quoted 5 lines
I checked all
qemu_opts_parse()invocations (and alldrive_def()invocations too, because it blindly forwards the former's retval). Only the two above examples look problematic.Signed-off-by Laszlo Ersek <[email protected]>
Your fix is fine. I didn't redo your search for other unsafe uses.
Quoted 27 lines · Markus Armbruster
Quoted 25 lines · Laszlo Ersek
qemu_opts_parse()can always return NULL, even if the QemuOptsList.desc in question would be trivial to satisfy (eg. because it's empty). For example:
qemu_opts_parse()
opts_parse()
qemu_opts_create()
id_wellformed()In practice:
$ .../qemu-system-x86_64 -acpitable id=3 qemu-system-x86_64: -acpitable id=3: Parameter 'id' expects an identifier ** ERROR:vl.c:3491:main: assertion failed: (opts != NULL) Aborted (core dumped)$ .../qemu-system-x86_64 -smbios id=3 qemu-system-x86_64: -smbios id=3: Parameter 'id' expects an identifier Segmentation fault (core dumped)I checked all
qemu_opts_parse()invocations (and alldrive_def()invocations too, because it blindly forwards the former's retval). Only the two above examples look problematic.
Quoted 6 lines
Quoted 1 line
Signed-off-by Laszlo Ersek <[email protected]>Your fix is fine. I didn't redo your search for other unsafe uses.
Reviewed-by Markus Armbruster <[email protected]>
Ping -- please commit this.
Thanks
Laszlo
Michael S. Tsirkin
AppliedQuoted 21 lines · Laszlo Ersek
qemu_opts_parse()can always return NULL, even if the QemuOptsList.desc in question would be trivial to satisfy (eg. because it's empty). For example:
qemu_opts_parse()
opts_parse()
qemu_opts_create()
id_wellformed()In practice:
$ .../qemu-system-x86_64 -acpitable id=3 qemu-system-x86_64: -acpitable id=3: Parameter 'id' expects an identifier ** ERROR:vl.c:3491:main: assertion failed: (opts != NULL) Aborted (core dumped)$ .../qemu-system-x86_64 -smbios id=3 qemu-system-x86_64: -smbios id=3: Parameter 'id' expects an identifier Segmentation fault (core dumped)
Quoted 5 lines
I checked all
qemu_opts_parse()invocations (and alldrive_def()invocations too, because it blindly forwards the former's retval). Only the two above examples look problematic.Signed-off-by Laszlo Ersek <[email protected]>
Applied, thanks.
Quoted 29 lines
--- vl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)vl.c +6
-1@@ -3488,11 +3488,16 @@ int main(int argc, char **argv, char **envp) }case QEMU_OPTION_acpitable: opts =qemu_opts_parse (qemu_find_opts ("acpi" ), optarg,1 ); -g_assert (opts !=NULL ); +if (!opts) { +exit (1 ); + }do_acpitable_option (opts);break ;case QEMU_OPTION_smbios: opts =qemu_opts_parse (qemu_find_opts ("smbios" ), optarg,0 ); +if (!opts) { +exit (1 ); + }do_smbios_option (opts);break ;case QEMU_OPTION_enable_kvm:Signature · 1 line
1.8.3.1