From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51148)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alistair23@gmail.com>) id 1aZQzK-0003yq-7T
	for qemu-devel@nongnu.org; Fri, 26 Feb 2016 17:35:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alistair23@gmail.com>) id 1aZQzJ-0008Sk-8E
	for qemu-devel@nongnu.org; Fri, 26 Feb 2016 17:35:54 -0500
MIME-Version: 1.0
Sender: alistair23@gmail.com
In-Reply-To: <1456493044-10025-2-git-send-email-peter.maydell@linaro.org>
References: <1456493044-10025-1-git-send-email-peter.maydell@linaro.org>
	<1456493044-10025-2-git-send-email-peter.maydell@linaro.org>
From: Alistair Francis <alistair.francis@xilinx.com>
Date: Fri, 26 Feb 2016 14:35:19 -0800
Message-ID: <CAKmqyKO5Vu7Ws9RO2UyH4zvUtxBmpk0BuZh-zX-izWgDm2=04w@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH 1/2] sd.c: Handle NULL block backend in
	sd_get_inserted()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Patch Tracking <patches@linaro.org>, Peter Crosthwaite <crosthwaite.peter@gmail.com>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, Andrew Baumann <Andrew.Baumann@microsoft.com>, Alistair Francis <alistair.francis@xilinx.com>, qemu-arm <qemu-arm@nongnu.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>

On Fri, Feb 26, 2016 at 5:24 AM, Peter Maydell <peter.maydell@linaro.org> wrote:
> The sd.c SD card emulation code can be in a state where the
> SDState BlockBackend pointer is NULL; this is treated as
> "card not present". Add a missing check to sd_get_inserted()
> so that we don't segfault in this situation.
>
> (This could be provoked by the guest writing to the SDHCI
> register to do a reset on a xilinx-zynq-a9 board; it will
> also happen at startup when sdhci implements its DeviceClass
> reset method.)
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Thanks,

Alistair

> ---
>  hw/sd/sd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index edb6b32..00c320d 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -449,7 +449,7 @@ static void sd_reset(DeviceState *dev)
>
>  static bool sd_get_inserted(SDState *sd)
>  {
> -    return blk_is_inserted(sd->blk);
> +    return sd->blk && blk_is_inserted(sd->blk);
>  }
>
>  static bool sd_get_readonly(SDState *sd)
> --
> 1.9.1
>
>