[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/23] hw/core/generic-loader: Fix crash when running
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 15/23] hw/core/generic-loader: Fix crash when running without CPU |
Date: |
Sun, 7 May 2017 10:02:18 +0300 |
From: Thomas Huth <address@hidden>
When running QEMU with "-M none -device loader,file=kernel.elf", it
currently crashes with a segmentation fault, because the "none"-machine
does not have any CPU by default and the generic loader code tries
to dereference s->cpu. Fix it by adding an appropriate check for a
NULL pointer.
Reported-by: Laurent Vivier <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/core/generic-loader.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 58f1f02902..46012673c3 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -137,20 +137,21 @@ static void generic_loader_realize(DeviceState *dev,
Error **errp)
#endif
if (s->file) {
+ AddressSpace *as = s->cpu ? s->cpu->as : NULL;
+
if (!s->force_raw) {
size = load_elf_as(s->file, NULL, NULL, &entry, NULL, NULL,
- big_endian, 0, 0, 0, s->cpu->as);
+ big_endian, 0, 0, 0, as);
if (size < 0) {
size = load_uimage_as(s->file, &entry, NULL, NULL, NULL, NULL,
- s->cpu->as);
+ as);
}
}
if (size < 0 || s->force_raw) {
/* Default to the maximum size being the machine's ram size */
- size = load_image_targphys_as(s->file, s->addr, ram_size,
- s->cpu->as);
+ size = load_image_targphys_as(s->file, s->addr, ram_size, as);
} else {
s->addr = entry;
}
--
2.11.0
- [Qemu-devel] [PULL 00/23] Trivial patches for 2017-05-07, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 08/23] qga: fix compiler warnings (clang 5), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 12/23] use _Static_assert in QEMU_BUILD_BUG_ON, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 11/23] channel-file: fix wrong parameter comments, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 01/23] Remove reduntant qemu: from error functions, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 09/23] util: Use g_malloc/g_free in envlist.c, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 14/23] virtio-blk: Remove useless condition around g_free(), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 15/23] hw/core/generic-loader: Fix crash when running without CPU,
Michael Tokarev <=
- [Qemu-devel] [PULL 23/23] tests: Remove redundant assignment, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 06/23] usb-ccid: make ccid_write_data_block() cope with null buffers, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 19/23] tests: Ignore another built executable (test-hmp), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 13/23] qemu-doc: Fix broken URLs of amnhltm.zip and dosidle210.zip, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 04/23] Add 'none' as type for drive's if option, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 02/23] ppc_booke: drop useless assignment, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 07/23] device_tree: fix compiler warnings (clang 5), Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 22/23] MAINTAINERS: Update paths for AioContext implementation, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 10/23] block: Make 'replication_state' an enum, Michael Tokarev, 2017/05/07
- [Qemu-devel] [PULL 18/23] scripts: Switch to more portable Perl shebang, Michael Tokarev, 2017/05/07