From: Hillf Danton Subject: [patch] drm/ttm: capture overflow of mapping boundary in ttm_bo_kmap() Date: Tue, 2 Apr 2019 10:21:38 +0800 Message-ID: <20190402074352.AC99E6E6EF@gabe.freedesktop.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0124042560==" Return-path: Received: from mail3-166.sinamail.sina.com.cn (mail3-166.sinamail.sina.com.cn [202.108.3.166]) by gabe.freedesktop.org (Postfix) with SMTP id 7C7266E2BD for ; Tue, 2 Apr 2019 02:36:51 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: "dri-devel@lists.freedesktop.org" Cc: "Junwei Zhang " , "Huang Rui " , "Christian Koenig " List-Id: dri-devel@lists.freedesktop.org --===============0124042560== Content-Type: multipart/alternative; boundary="_33028EC8-7F72-4EDC-87CC-82AE7E19742D_" --_33028EC8-7F72-4EDC-87CC-82AE7E19742D_ Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simply complain if the combined result of start_page and num_pages goes ove= r the pages bo has. Let me know if the added warning is too heavy a hammer. Cc: Christian Koenig Cc: Huang Rui Cc: Junwei Zhang Signed-off-by: Hillf Danton --- --- a/drivers/gpu/drm/ttm/ttm_bo_util.c 2019-04-02 09:27:24.521761100 +0800 +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c 2019-04-02 09:37:52.108898500 +0800 @@ -631,6 +631,8 @@ int ttm_bo_kmap(struct ttm_buffer_object return -EINVAL; if (start_page > bo->num_pages) return -EINVAL; + if (WARN_ON(start_page > bo->num_pages - num_pages)) + return -EINVAL; =20 (void) ttm_mem_io_lock(man, false); ret =3D ttm_mem_io_reserve(bo->bdev, &bo->mem); -- --_33028EC8-7F72-4EDC-87CC-82AE7E19742D_ Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset="utf-8"

Simply complain if the combined result of start= _page and num_pages goes over

the pages bo has. Let me know if the added warning is too heavy a hamm= er.

 

Cc: Christian Koenig <chr= istian.koenig@amd.com>

Cc: Huang Rui <ray.huang@amd.com>

Cc: Junwei Zhang <Jerry.Zhang@amd.com>

Signed-off-by: Hillf Danton <hdanton= @sina.com>

---<= /p>

 

--- a/drivers/gpu/drm/ttm/ttm_bo_util.c= 2019-04-02 09:27:24.521761100 +0800

+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c=C2=A0=C2=A0=C2=A0=C2=A0= 2019-04-02 09:37:52.108898500 +0800

@@ -631,6 +631,8 @@ int ttm_bo_kmap(struct ttm_buffer_object

=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -EINVAL;

=

=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if = (start_page > bo->num_pages)

=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 return -EINVAL;

+=C2=A0=C2=A0=C2=A0 if (WARN_ON(start_page > bo->num_pages - num_pag= es))

+=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -EINVAL;

=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (void) ttm_mem_io_lock(man,= false);

=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 ret =3D ttm_mem_io_reserve(bo->bdev, &bo->mem);

--

 

= --_33028EC8-7F72-4EDC-87CC-82AE7E19742D_-- --===============0124042560== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs --===============0124042560==--