| Message ID | 1456493044-10025-2-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 > >
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)
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> --- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)