From patchwork Fri Mar 18 15:51:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 8621381 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86CD1C0553 for ; Fri, 18 Mar 2016 15:51:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C58D020361 for ; Fri, 18 Mar 2016 15:51:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 03B6E20221 for ; Fri, 18 Mar 2016 15:51:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BD6346EC00; Fri, 18 Mar 2016 15:51:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 1ECC36EC00 for ; Fri, 18 Mar 2016 15:51:33 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 18 Mar 2016 08:51:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,355,1455004800"; d="scan'208";a="766873103" Received: from unknown (HELO localhost.isw.intel.com) ([10.237.224.39]) by orsmga003.jf.intel.com with ESMTP; 18 Mar 2016 08:51:31 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Fri, 18 Mar 2016 15:51:22 +0000 Message-Id: <1458316282-25229-1-git-send-email-matthew.auld@intel.com> X-Mailer: git-send-email 2.4.3 Subject: [Intel-gfx] [PATCH] drm/i915: add sanity check for partial view creation 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Upon creating a partial view we should check that the offset + size is valid relative to the size of the gem object. v2: (Tvrtko Ursulin) - Don't use pages->nents to determine the page count v3: (Chris Wilson) - Handle potential overflow v4: (Chris Wilson) - Idiomatically handle overflow - Less idiotic placement - Treat as programmer error Cc: Joonas Lahtinen Signed-off-by: Matthew Auld --- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index fb0f963..593eb15 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3356,6 +3356,14 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj, if (WARN_ON(!view)) return ERR_PTR(-EINVAL); + if (view->type == I915_GGTT_VIEW_PARTIAL) { + unsigned int page_count = obj->base.size >> PAGE_SHIFT; + if (WARN_ON(view->params.partial.offset > page_count || + view->params.partial.size > page_count - + view->params.partial.offset)) + return ERR_PTR(-EINVAL); + } + vma = i915_gem_obj_to_ggtt_view(obj, view); if (IS_ERR(vma))