[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] hw/pl011.c: Avoid crash on read when no chr b
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 01/10] hw/pl011.c: Avoid crash on read when no chr backend present |
Date: |
Fri, 20 Jul 2012 16:00:21 +0100 |
Add a missing guard that meant we would segfault if the guest read
UARTDR on a PL011 serial device which had no chr backend connected.
(This didn't happen for Linux guests because Linux reads the flags
register and doesn't try to read the UART if it's empty.)
Reported-by: Christian Müller <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/pl011.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/pl011.c b/hw/pl011.c
index 8a5a8f5..3245702 100644
--- a/hw/pl011.c
+++ b/hw/pl011.c
@@ -78,7 +78,9 @@ static uint64_t pl011_read(void *opaque, target_phys_addr_t
offset,
if (s->read_count == s->read_trigger - 1)
s->int_level &= ~ PL011_INT_RX;
pl011_update(s);
- qemu_chr_accept_input(s->chr);
+ if (s->chr) {
+ qemu_chr_accept_input(s->chr);
+ }
return c;
case 1: /* UARTCR */
return 0;
--
1.7.5.4
- [Qemu-devel] [PATCH 05/10] i.MX: UART support, (continued)
- [Qemu-devel] [PATCH 05/10] i.MX: UART support, Peter Maydell, 2012/07/04
- Re: [Qemu-devel] [PULL 00/10] arm-devs queue, Blue Swirl, 2012/07/07
- [Qemu-devel] [PULL 00/10] arm-devs queue, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 04/10] hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 09/10] hw/exynos4210_rtc.c: remove unnecessary code, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 08/10] hw/exynos4210_rtc.c: Fix calculating for value of year, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 06/10] hw/arm_boot.c: Support DTBs which use 64 bit addresses, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 03/10] hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 10/10] exynos4210: add Exynos4210 i2c implementation, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 07/10] hw/vexpress.c: Allow >4GB of RAM for Cortex-A15 daughterboard, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 01/10] hw/pl011.c: Avoid crash on read when no chr backend present,
Peter Maydell <=
- [Qemu-devel] [PATCH 05/10] device_tree: Add support for reading device tree properties, Peter Maydell, 2012/07/20
- [Qemu-devel] [PATCH 02/10] hw/arm_boot.c: Make ram_size a uint64_t, Peter Maydell, 2012/07/20