From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCPr-0007L0-7x for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:44:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOCPo-0002gl-2o for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:44:19 -0500 Received: from mail.kernel.org ([198.145.29.136]:51185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCPn-0002gV-Mm for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:44:16 -0500 Date: Wed, 18 Feb 2015 22:44:09 +0100 From: "Michael S. Tsirkin" Message-ID: <1424295164-4774-3-git-send-email-mst@redhat.com> References: <1424295164-4774-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424295164-4774-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 02/96] bios linker: validate pointer within table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , dgilbert@redhat.com, Juan Quintela buios linker assumes pointer parameter it gets is within table, validate this. Signed-off-by: Michael S. Tsirkin --- hw/acpi/bios-linker-loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c index 5cc4d90..d9382f8 100644 --- a/hw/acpi/bios-linker-loader.c +++ b/hw/acpi/bios-linker-loader.c @@ -141,6 +141,7 @@ void bios_linker_loader_add_pointer(GArray *linker, uint8_t pointer_size) { BiosLinkerLoaderEntry entry; + size_t offset = (gchar *)pointer - table->data; memset(&entry, 0, sizeof entry); strncpy(entry.pointer.dest_file, dest_file, @@ -148,7 +149,8 @@ void bios_linker_loader_add_pointer(GArray *linker, strncpy(entry.pointer.src_file, src_file, sizeof entry.pointer.src_file - 1); entry.command = cpu_to_le32(BIOS_LINKER_LOADER_COMMAND_ADD_POINTER); - entry.pointer.offset = cpu_to_le32((gchar *)pointer - table->data); + assert(table->len >= offset + pointer_size); + entry.pointer.offset = cpu_to_le32(offset); entry.pointer.size = pointer_size; assert(pointer_size == 1 || pointer_size == 2 || pointer_size == 4 || pointer_size == 8); -- MST