From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZURwv-0007Wm-UF for qemu-devel@nongnu.org; Wed, 26 Aug 2015 00:04:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZURwq-0003Sb-Vk for qemu-devel@nongnu.org; Wed, 26 Aug 2015 00:04:33 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:36090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZURwq-0003Qb-AV for qemu-devel@nongnu.org; Wed, 26 Aug 2015 00:04:28 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Aug 2015 09:34:24 +0530 From: Bharata B Rao Date: Wed, 26 Aug 2015 09:34:11 +0530 Message-Id: <1440561851-17553-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [FIX PATCH] spapr_rtas: Prevent QEMU crash during hotplug without a prior device_add List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Bharata B Rao , qemu-ppc@nongnu.org, Michael Roth , david@gibson.dropbear.id.au If drmgr is used in the guest to hotplug a device before a device_add has been issued via the QEMU monitor, QEMU segfaults in configure_connector call. This occurs due to accessing of NULL FDT which otherwise would have been created and associated with the DRC during device_add command. Check for NULL FDT and return failure from configure_connector call. Signed-off-by: Bharata B Rao Cc: Michael Roth --- Not fully sure if RTAS_OUT_HW_ERROR is the right error code here. Should we be using RTAS_OUT_NOT_SUPPORTED instead ? hw/ppc/spapr_rtas.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index e99e25f..3be8eec 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -522,6 +522,12 @@ static void rtas_ibm_configure_connector(PowerPCCPU *cpu, drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); fdt = drck->get_fdt(drc, NULL); + if (!fdt) { + DPRINTF("rtas_ibm_configure_connector: Missing FDT for DRC index: %xh\n", + drc_index); + rc = RTAS_OUT_HW_ERROR; + goto out; + } ccs = spapr_ccs_find(spapr, drc_index); if (!ccs) { -- 2.1.0