]> git.proxmox.com Git - mirror_qemu.git/commitdiff
acpi: verify file entries in bios_linker_loader_add_pointer()
authorLiam Merwick <liam.merwick@oracle.com>
Thu, 21 Mar 2019 20:13:49 +0000 (20:13 +0000)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 2 Apr 2019 15:49:14 +0000 (11:49 -0400)
The callers to bios_linker_find_file() assert that the file entry returned
is not NULL, except for those in bios_linker_loader_add_pointer().  Add two
asserts in that case for completeness and to facilitate static code analysis.

Signed-off-by: Liam Merwick <liam.merwick@oracle.com>
Message-Id: <1553199229-25318-1-git-send-email-liam.merwick@oracle.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/acpi/bios-linker-loader.c

index d16b8bbcb187174daf21e36ed0a2bf2fc7a0e842..626c04a39f92e2fed69fdabf9a10c2116f2aefcd 100644 (file)
@@ -283,6 +283,8 @@ void bios_linker_loader_add_pointer(BIOSLinker *linker,
     const BiosLinkerFileEntry *source_file =
         bios_linker_find_file(linker, src_file);
 
+    assert(dst_file);
+    assert(source_file);
     assert(dst_patched_offset < dst_file->blob->len);
     assert(dst_patched_offset + dst_patched_size <= dst_file->blob->len);
     assert(src_offset < source_file->blob->len);