From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D64FC28CC4 for ; Sat, 1 Jun 2019 05:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA9F92447D for ; Sat, 1 Jun 2019 05:47:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YHiEJLdl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726179AbfFAFr0 (ORCPT ); Sat, 1 Jun 2019 01:47:26 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39473 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725916AbfFAFrZ (ORCPT ); Sat, 1 Jun 2019 01:47:25 -0400 Received: by mail-pf1-f193.google.com with SMTP id j2so7458867pfe.6 for ; Fri, 31 May 2019 22:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=N4NYqP5qcFsuKou3hOU2QoLbHi9KXa2wwTKFEejFE9g=; b=YHiEJLdlNslOmqVxxCDPqKHWKNoy3U8FqNRl6OXkForegge1wL/cfA5vNcL0vXHSkE 16X7UP9rxWjnITY62EyvrbyaV9fp6E7FCjytDj5vKX2kTN95rG2hjUnaqnAH4yXXzCc0 iGd8IlCwyGAgw2dju6uBwMUTJoXf/3lU/8lFQLTwgTIJS1mYyGwf2R2IDjUov/x4Yu7m x0+DDkFJx5erlLm/0DbDsR9oWSayJnjv9k4S6sq5ymhUsbEZ/IX0I7MTHDZAmJeulx7B 0HAxSc1JPDvaZvDg8sRaywaoUAh4n9RMy994KN5JDNQ0TMXoV3g8bzmvrfvUb5pvmGWg 2IGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=N4NYqP5qcFsuKou3hOU2QoLbHi9KXa2wwTKFEejFE9g=; b=R32KDZcF9ZKnTYfluVl8yy0A0p3SbLVCQwkhXvCHnu9OOWG498TiCOZq08eY07VTCZ erdD2qemg2psCeRCJIRPZ+o3a9w2kFnMcHhAddlXOiE0bb5s3bbxJa6MQwYjPOgvVUPO CW1M4poMUnE7n8U4NJ24sKOPHO6nscVCTefae9DDR/j9S/4wFlQmUetcH/FGqfx1utnh xzg6WyV7bQ+h6tHwr0j0xJBtP3CsRhkWB9u21Ww1CJL14PK7HiXY7CPEVWXxfyp1pSr/ 7YVlsvj5zdPPZZ5sTERcIgwdTqA0T+Yq6M4BWTcxZujVDLNZVdLFiVGvzI7fhpFU/CNZ t6zg== X-Gm-Message-State: APjAAAUUwPNSqgeCzXQ369Y6M0JUaWaXK8t5FnbVHjcPdHmfFYTs+jJc qheGWKEjjKGMPY41tLUCBGde8A== X-Google-Smtp-Source: APXvYqyWwgqCn57/81AHKxNxBjxPxel3NYyFS7mKcCvinFDQWA3aWLt0spiLAHLYe9RqMBaXDnB0zw== X-Received: by 2002:a05:6a00:46:: with SMTP id i6mr1498503pfk.173.1559368044910; Fri, 31 May 2019 22:47:24 -0700 (PDT) Received: from tuxbook-pro (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id n21sm7833707pff.92.2019.05.31.22.47.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 May 2019 22:47:24 -0700 (PDT) Date: Fri, 31 May 2019 22:48:04 -0700 From: Bjorn Andersson To: Jordan Crouse Cc: freedreno@lists.freedesktop.org, Sean Paul , Kees Cook , linux-arm-msm@vger.kernel.org, Sharat Masetty , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Douglas Anderson , Rob Clark , David Airlie , Jonathan Marek , Mamta Shukla , Daniel Vetter Subject: Re: [PATCH] drm/msm/adreno: Ensure that the zap shader region is big enough Message-ID: <20190601054804.GF22737@tuxbook-pro> References: <1559340578-11482-1-git-send-email-jcrouse@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1559340578-11482-1-git-send-email-jcrouse@codeaurora.org> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 31 May 15:09 PDT 2019, Jordan Crouse wrote: > Before loading the zap shader we should ensure that the reserved memory > region is big enough to hold the loaded file. > > Signed-off-by: Jordan Crouse Reviewed-by: Bjorn Andersson > --- > > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 6f7f411..3db8e49 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -67,7 +67,6 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > return ret; > > mem_phys = r.start; > - mem_size = resource_size(&r); > > /* Request the MDT file for the firmware */ > fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > @@ -83,6 +82,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > goto out; > } > > + if (mem_size > resource_size(&r)) { > + DRM_DEV_ERROR(dev, > + "memory region is too small to load the MDT\n"); > + ret = -E2BIG; > + goto out; > + } > + > /* Allocate memory for the firmware image */ > mem_region = memremap(mem_phys, mem_size, MEMREMAP_WC); > if (!mem_region) { > -- > 2.7.4 >