Fix error handling in qemu_read_config_file
PATCH 1/1 Fix error handling in qemu_read_config_file
We need to close the file even in error case. While at it, make the callers catch all kind of errors. ENOENT is allowed for default config files, they are optional.
Reported-by Luiz Capitulino <[email protected]>
Signed-off-by Kevin Wolf <[email protected]>
--- qemu-config.c | 12 ++++++++---- vl.c | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-)
qemu-config.c +8 -4
@@ -521,14 +521,18 @@ out:int qemu_read_config_file (const char *filename) {FILE *f =fopen (filename,"r" ); +int ret; +if (f ==NULL ) {return -errno; } -if (qemu_config_parse (f, vm_config_groups, filename) !=0 ) { -return -EINVAL ; - } + ret =qemu_config_parse (f, vm_config_groups, filename);fclose (f); -return 0 ; +if (ret ==0 ) { +return 0 ; + }else { +return -EINVAL ; + } }
vl.c +2 -2
@@ -2683,12 +2683,12 @@ int main(int argc, char **argv, char **envp)int ret; ret =qemu_read_config_file (CONFIG_QEMU_CONFDIR "/qemu.conf" ); -if (ret == -EINVAL ) { +if (ret <0 && ret != -ENOENT ) {exit (1 ); } ret =qemu_read_config_file (arch_config_name); -if (ret == -EINVAL ) { +if (ret <0 && ret != -ENOENT ) {exit (1 ); } }
Signature · 1 line
1.6.6.1
Anthony Liguori
AppliedQuoted 7 lines · Kevin Wolf
We need to close the file even in error case. While at it, make the callers catch all kind of errors. ENOENT is allowed for default config files, they are optional.
Reported-by Luiz Capitulino<[email protected]>Signed-off-by Kevin Wolf<[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 52 lines
--- qemu-config.c | 12 ++++++++---- vl.c | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-)qemu-config.c +8
-4@@ -521,14 +521,18 @@ out:int qemu_read_config_file (const char *filename) {FILE *f =fopen (filename,"r" ); +int ret; +if (f ==NULL ) {return -errno; } -if (qemu_config_parse (f, vm_config_groups, filename) !=0 ) { -return -EINVAL ; - } + ret =qemu_config_parse (f, vm_config_groups, filename);fclose (f); -return 0 ; +if (ret ==0 ) { +return 0 ; + }else { +return -EINVAL ; + } }vl.c +2
-2@@ -2683,12 +2683,12 @@ int main(int argc, char **argv, char **envp)int ret; ret =qemu_read_config_file (CONFIG_QEMU_CONFDIR "/qemu.conf" ); -if (ret == -EINVAL ) { +if (ret<0 && ret != -ENOENT ) {exit (1 ); } ret =qemu_read_config_file (arch_config_name); -if (ret == -EINVAL ) { +if (ret<0 && ret != -ENOENT ) {exit (1 ); } }