From patchwork Wed Jul 16 07:42:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 370625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C014B14003E for ; Wed, 16 Jul 2014 17:43:35 +1000 (EST) Received: from localhost ([::1]:38021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7JsD-0005Ef-Hd for incoming@patchwork.ozlabs.org; Wed, 16 Jul 2014 03:43:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Jrr-0004tO-ET for qemu-devel@nongnu.org; Wed, 16 Jul 2014 03:43:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7Jrm-00028M-6p for qemu-devel@nongnu.org; Wed, 16 Jul 2014 03:43:11 -0400 Received: from greensocs.com ([178.33.234.66]:41684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Jrm-00028H-0R; Wed, 16 Jul 2014 03:43:06 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 9CDE828487; Wed, 16 Jul 2014 09:43:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at Received: from greensocs.com ([127.0.0.1]) by localhost (greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uOY-XD6ZmOmy; Wed, 16 Jul 2014 09:43:48 +0200 (CEST) Received: by greensocs.com (Postfix, from userid 998) id 769B128485; Wed, 16 Jul 2014 09:43:48 +0200 (CEST) Received: from localhost.localdomain (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 27C4228407; Wed, 16 Jul 2014 09:43:48 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, qemu-stable@nongnu.org Date: Wed, 16 Jul 2014 09:42:54 +0200 Message-Id: <1405496574-3938-1-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.9.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 178.33.234.66 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH for-2.1] cadence_uart: check serial backend before using it. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: KONRAD Frederic Segfault occurs when there are less than two serial backends with zynq platform. This checks that s->chr is not NULL before using it. Signed-off-by: KONRAD Frederic Reviewed-by: Peter Crosthwaite --- hw/char/cadence_uart.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index dbbc167..958b6ac 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -175,8 +175,10 @@ static void uart_send_breaks(UartState *s) { int break_enabled = 1; - qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK, - &break_enabled); + if (s->chr) { + qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_BREAK, + &break_enabled); + } } static void uart_parameters_setup(UartState *s) @@ -227,7 +229,9 @@ static void uart_parameters_setup(UartState *s) packet_size += ssp.data_bits + ssp.stop_bits; s->char_tx_time = (get_ticks_per_sec() / ssp.speed) * packet_size; - qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); + if (s->chr) { + qemu_chr_fe_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); + } } static int uart_can_receive(void *opaque) @@ -375,7 +379,9 @@ static void uart_read_rx_fifo(UartState *s, uint32_t *c) *c = s->rx_fifo[rx_rpos]; s->rx_count--; - qemu_chr_accept_input(s->chr); + if (s->chr) { + qemu_chr_accept_input(s->chr); + } } else { *c = 0; }