Message ID | 1516887809-6265-20-git-send-email-peter.maydell@linaro.org |
---|---|
State | Not Applicable |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1125266ljf; Thu, 25 Jan 2018 05:51:14 -0800 (PST) X-Google-Smtp-Source: AH8x227ofzsH5SZ/6/7IooHgqUJGf9uMiuxTbXHPUUE1tJsqhmqCNBa1pTYbZShdQizTNPGICj7k X-Received: by 10.13.221.211 with SMTP id g202mr8525739ywe.134.1516888274066; Thu, 25 Jan 2018 05:51:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516888274; cv=none; d=google.com; s=arc-20160816; b=hA/PQshvjuwXdyxOYS6U7VXEC1Hudoi3oLw99P1X8QunzSUc+NGN3+Ldvs6w8GzLpw l8EAL19GFsKL4CV+Czxad9vYGqqldOwLL36XKYdm1HZxJvOXB3ltuw2O2wEmlstfYnRK lSHg7oR1NuYYpzXv5LfkmSh/+O2il5uGl4Wj/WYfDl0gtPNxpwAYtGRne9w//HxH7rUi VANPR2nAyA3qJDOtiWw3cXC/irwhTE2PEq/aTRO8paVNl/UNxigy2HkFdmoNSkhdT00+ mlM/Bbfc2fNWvWlPQ08oNAw2/6/eFulq9iRDprGa9BPv3KS+Y/RAv97jMW9dbG1Ggd3o LaWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=oi4jkbgHQ+rShSgOPrm1rINRrOP9X4eAOOrobF7ORxs=; b=qaqmdJh69gsZuN2UcKUiRnNAgF9xYooah6nyxS0ShF77jXatZPaYiISRAH38b0mch5 SNTDjuJ0IV/UgVvK8e+jCfr6XZoqmRy1P48pnepKvzgP0+MLIk3cwjOTtjRE01ky0B+a tTSUMndyAJ/3C4HTzdWvuZ5y/S3duGXzOnN1bcjCB3PilDFyffJbzu7qhqzztFNz9/kW T85kaM+arrmvNUQXXxee7ujHqSLohyUlzzYBF65h5+VZPZkPqSSJfRN4+NDdr3C1ssVJ /f4CSTI9S64jywwYmew+j4Su1bZCrOUzkrTcsiy7yJKC4YcQm1E7XzdNVyOqwutdt/Cl dwUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 205si72088yws.342.2018.01.25.05.51.13 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 25 Jan 2018 05:51:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1eehvt-00083M-DI for patch@linaro.org; Thu, 25 Jan 2018 08:51:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1eehom-0003LC-5O for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1eehol-0003Cz-8I for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:52 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:45994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1eehol-0003BN-18 for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:51 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1eehoj-0006y2-HC for qemu-devel@nongnu.org; Thu, 25 Jan 2018 13:43:49 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 13:43:27 +0000 Message-Id: <1516887809-6265-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516887809-6265-1-git-send-email-peter.maydell@linaro.org> References: <1516887809-6265-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 19/21] 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: <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> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index cb37182..1cf70f8 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 f9264d3..fac7fa5 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 */