From patchwork Tue Jan 23 13:20:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 864781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NBmiah2o"; dkim-atps=neutral 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 3zQpq74Hl9z9ryr for ; Wed, 24 Jan 2018 00:21:39 +1100 (AEDT) Received: from localhost ([::1]:57955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edyW9-0000Yv-Mw for incoming@patchwork.ozlabs.org; Tue, 23 Jan 2018 08:21:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edyVZ-0000Xa-Aw for qemu-devel@nongnu.org; Tue, 23 Jan 2018 08:21:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edyVW-0005MY-75 for qemu-devel@nongnu.org; Tue, 23 Jan 2018 08:21:01 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:46642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edyVW-0005MM-2y for qemu-devel@nongnu.org; Tue, 23 Jan 2018 08:20:58 -0500 Received: by mail-qt0-x244.google.com with SMTP id o35so1076813qtj.13 for ; Tue, 23 Jan 2018 05:20:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kWtXiCUCCwkVNTFsgDIMxqWsn5SIUjjGA+jGm5hYQSs=; b=NBmiah2oVV4BwByt+ChCk2rG96c9wSCOnTCnCRFRM3qy0m0R6q+XjETaDNjekZawnH Fhn9AEtCmjsT6ZV3ngqkwbTSMtVNKU2/rd4Iwx6/v6jQK3peWOnLStdBQjkT/K4ygUN9 myeVxZWbT1i4sawUwabA5PjMbJJbPPMvmdoJQliaCBQgwzR9Qu0B+Wv4hYaZPKCwXjB/ bVg8Ey5fCcpkA3xUVhYu9wPTIjEzjji6xTwziPm4coY4hGnPFVkt8OE2Ckvj2WHTQDFu z7rFBYyZmK8bQcAJdotwQ2p/Bwyu4SKWoimCADxiGFkeyTxLr2FJ4WsiDNqIIXpMdzLg iePg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=kWtXiCUCCwkVNTFsgDIMxqWsn5SIUjjGA+jGm5hYQSs=; b=V+v/bUtceplCMHJcJ5f430iwnR8bcqvQl8fJgyA/W0sL8QA9B410dLjXFxuApZY8B3 +XrhHQXJiR/PJcJ4RRbOzk073cOKCEQUckL3gQR5eutVWg6yvmGJv/7rtlz2C9Iq80AK twe26XAwBY+l2ZZBjsWZ5Lbo+9m5SoZhF8PRr4ne1QJvbmKbZXZjVKuXGix/zkC32h0w 7yG2qyS1vpsZtf1ufGlbWOEk5Cgqo9pUkWwXeEM/KosHF0q2gVDXJ3X9KJX2mP+qqajS n5Nm+7kqLXkgMqJTFZs7sw3aRn2ZbITxY7FsiaI5zVODEHj0RoV2FcKwjXJLpNB1ayLF yU3g== X-Gm-Message-State: AKwxytfjSQRqMC3JXfIWwTdiY+LvkHqkLWVz/7FEBwoZ8cnxD24cP9ia chkEaLFj+x7BsT0W7p14UqM= X-Google-Smtp-Source: AH8x226suguZPR42yPeZyivCUiaurf9Bw4fj7qtZOlcQVtFSOFOz7yQePZ3JHfpchwSINIaRa8cNew== X-Received: by 10.233.237.18 with SMTP id c18mr3407589qkg.267.1516713657436; Tue, 23 Jan 2018 05:20:57 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id s12sm12112330qke.4.2018.01.23.05.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 05:20:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Tue, 23 Jan 2018 10:20:50 -0300 Message-Id: <20180123132051.24448-1-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH] sdhci: fix a NULL pointer dereference due to uninitialized AddresSpace object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" missed in 60765b6ceeb4. Thread 1 "qemu-system-aarch64" received signal SIGSEGV, Segmentation fault. address_space_init (as=0x0, root=0x55555726e410, name=name@entry=0x555555e3f0a7 "sdhci-dma") at memory.c:3050 3050 as->root = root; (gdb) bt #0 address_space_init (as=0x0, root=0x55555726e410, name=name@entry=0x555555e3f0a7 "sdhci-dma") at memory.c:3050 #1 0x0000555555af62c3 in sdhci_sysbus_realize (dev=, errp=0x7fff7f931150) at hw/sd/sdhci.c:1564 #2 0x00005555558b25e5 in zynqmp_sdhci_realize (dev=0x555557051520, errp=0x7fff7f931150) at hw/sd/zynqmp-sdhci.c:151 #3 0x0000555555a2e7f3 in device_set_realized (obj=0x555557051520, value=, errp=0x7fff7f931270) at hw/core/qdev.c:966 #4 0x0000555555ba3f74 in property_set_bool (obj=0x555557051520, v=, name=, opaque=0x555556e04a20, errp=0x7fff7f931270) at qom/object.c:1906 #5 0x0000555555ba51f4 in object_property_set (obj=obj@entry=0x555557051520, v=v@entry=0x5555576dbd60, name=name@entry=0x555555dd6306 "realized", errp=errp@entry=0x7fff7f931270) at qom/object.c:1102 Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index cb37182536..1cf70f8c23 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -41,6 +41,7 @@ typedef struct SDHCIState { /*< public >*/ SDBus sdbus; MemoryRegion iomem; + AddressSpace sysbus_dma_as; AddressSpace *dma_as; MemoryRegion *dma_mr; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f9264d3be5..fac7fa5c72 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1388,6 +1388,7 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) } if (s->dma_mr) { + s->dma_as = &s->sysbus_dma_as; address_space_init(s->dma_as, s->dma_mr, "sdhci-dma"); } else { /* use system_memory() if property "dma" not set */