From patchwork Fri Jan 27 16:55:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9542319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4E339604A0 for ; Fri, 27 Jan 2017 16:55:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 419DB26E98 for ; Fri, 27 Jan 2017 16:55:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3671527FC0; Fri, 27 Jan 2017 16:55:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 021D726E98 for ; Fri, 27 Jan 2017 16:55:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 684156EDD8; Fri, 27 Jan 2017 16:55:37 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A026F6EDD2 for ; Fri, 27 Jan 2017 16:55:35 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id d140so59736190wmd.2 for ; Fri, 27 Jan 2017 08:55:35 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=OwEdvI+LFGeS0NCdzfO0FJCdKdBvOrAXgTLeWM0VRHA=; b=pucPkgMZfxD+grDO/ghGDhm9GqCBg6x9WgXl/uts0Yi7+Hptdb6m+Dr2C1312zlfE+ FZn6RJUZKXJT3IOItTrXxrwpa/w/iHllvWQCrH3c4umJr+dQ+6NnQV4+Cg673wih71Jy KeISyQhVPK54w3j3bvAjciZWD88/56SOI8/JTZHm0vuQW8eIJUfpSCZm1S7dr9AEkpiW HbmD8YR9PTL5pFLwCHJAXZzCinSuKU9zE/jFbsXVMOVM4FCgWlia7i8TBGIM14Y+XBfn 0YJPzTiU9uySstYQDDFGD+t0wUkUpOIFNajTA4Q1ZjOQEqxnkOfbpUX4X4vPlEvWiggD q/Gg== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=OwEdvI+LFGeS0NCdzfO0FJCdKdBvOrAXgTLeWM0VRHA=; b=a0NaRGHfodvK+BVqAAlyZ17LFtkEcFSRuE9VWUSeJRZoZxoaj2uauRcxS0KevzOsug 5rcHzURxOjpa5Z8TsBKoutFmL8FrWCyri0nlb3SUkpsm8lwMxaqTp9COjKwjgiY3Ya9N vgnDcB6L3/puCTfh72OSIR6VYcpJ/niFCZxoIF70OPXgSm5VepeMpOwFK5ViOPkv1PyL mzM+RZNOki4oImc4k5jjcgjQcaZr2lY/GIQnu31mmLgLA35cUW+atfUPfgArVkP8PEAd /G0jYUsSL5j+XReeoQsl6P+jt7KmwxyVPLw8jrqrb45q4skQ7F1Tjw1wXmDQhvbBFqXR ZTLw== X-Gm-Message-State: AIkVDXIjiALVpBoKz47pYp03+0ZVbVmky0fJte1OUfuRFIW++lYmkf/kKMioi87JwURMHw== X-Received: by 10.28.168.11 with SMTP id r11mr3812266wme.16.1485536134228; Fri, 27 Jan 2017 08:55:34 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id x39sm8800095wrb.3.2017.01.27.08.55.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 08:55:33 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 27 Jan 2017 16:55:31 +0000 Message-Id: <20170127165531.28135-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170127165531.28135-1-chris@chris-wilson.co.uk> References: <20170127165531.28135-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Check that the DMA address for stolen fits within dma_addr_t X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Just sanity check that the value we deduce from the stolen memory register fits within the kernel's dma_addr_t and doesn't overflow. Signed-off-by: Chris Wilson Cc: Paulo Zanoni Cc: Ville Syrjälä --- drivers/gpu/drm/i915/i915_gem_stolen.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 42bbc4b04fd6..4f1f3090c0ed 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -211,6 +211,14 @@ static dma_addr_t i915_stolen_to_dma(struct drm_i915_private *dev_priv) ggtt_start &= PGTBL_ADDRESS_LO_MASK; ggtt_end = ggtt_start + ggtt_total_entries(ggtt) * 4; + if (ggtt_end <= ggtt_start || + overflows_type(ggtt_end, dma_addr_t)) { + DRM_ERROR("DMA address for reserved igfx memory [%llx - %llx] does not fit within the kernel's %db dma_addr_t\n", + ggtt_start, ggtt_end, + (int)sizeof(dma_addr_t) * 8); + return 0; + } + if (ggtt_start >= stolen[0].start && ggtt_start < stolen[0].end) stolen[0].end = ggtt_start; if (ggtt_end > stolen[1].start && ggtt_end <= stolen[1].end)