mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/smbios: Fix leaked fd in save_opt_one() error path

Browse Source 
Fix the following Coverity issue (RESOURCE_LEAK):

  CID 1432879: Resource leak

    Handle variable fd going out of scope leaks the handle.

Replace a close() call by qemu_close() since the handle is
opened with qemu_open().

Fixes: bb99f4772f ("hw/smbios: support loading OEM strings values from a file")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201030152742.1553968-1-philmd@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-30 16:27:42 +01:00 committed by Michael S. Tsirkin
parent 8faf2f1de4
commit 8055d2fb7f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/smbios/smbios.c
View File

@ -988,16 +988,18 @@ static int save_opt_one(void *opaque,
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Unable to read from %s: %s", error_setg(errp, "Unable to read from %s: %s",
value, strerror(errno)); value, strerror(errno));
qemu_close(fd);
return -1; return -1;
} }
if (memchr(buf, '\0', ret)) { if (memchr(buf, '\0', ret)) {
error_setg(errp, "NUL in OEM strings value in %s", value); error_setg(errp, "NUL in OEM strings value in %s", value);
qemu_close(fd);
return -1; return -1;
} }
g_byte_array_append(data, (guint8 *)buf, ret); g_byte_array_append(data, (guint8 *)buf, ret);
} }
close(fd); qemu_close(fd);
*opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1); *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1);
(*opt->dest)[*opt->ndest] = (char *)g_byte_array_free(data, FALSE); (*opt->dest)[*opt->ndest] = (char *)g_byte_array_free(data, FALSE);