qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Anthony Liguori <anthony@codemonkey.ws>,
	Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-devel@nongnu.org, Paul Brook <paul@codesourcery.com>
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	[thread overview]
Message-ID: <1342796430-16636-2-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1342796430-16636-1-git-send-email-peter.maydell@linaro.org>

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 <christian.mueller@heig-vd.ch>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 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

  reply	other threads:[~2012-07-20 15:00 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-20 15:00 [Qemu-devel] [PULL 00/10] arm-devs queue Peter Maydell
2012-07-20 15:00 ` Peter Maydell [this message]
2012-07-20 15:00 ` [Qemu-devel] [PATCH 02/10] hw/arm_boot.c: Make ram_size a uint64_t Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 03/10] hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 04/10] hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 05/10] device_tree: Add support for reading device tree properties Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 06/10] hw/arm_boot.c: Support DTBs which use 64 bit addresses Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 07/10] hw/vexpress.c: Allow >4GB of RAM for Cortex-A15 daughterboard Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 08/10] hw/exynos4210_rtc.c: Fix calculating for value of year Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 09/10] hw/exynos4210_rtc.c: remove unnecessary code Peter Maydell
2012-07-20 15:00 ` [Qemu-devel] [PATCH 10/10] exynos4210: add Exynos4210 i2c implementation Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1342796430-16636-2-git-send-email-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=anthony@codemonkey.ws \
    --cc=blauwirbel@gmail.com \
    --cc=paul@codesourcery.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).