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=-14.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 60AD5C2B9F4 for ; Mon, 14 Jun 2021 16:40:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 03A6461078 for ; Mon, 14 Jun 2021 16:40:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03A6461078 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zary.sk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=nouveau-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09F8B6E039; Mon, 14 Jun 2021 16:40:20 +0000 (UTC) Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by gabe.freedesktop.org (Postfix) with ESMTP id E1D5F89FCA; Mon, 14 Jun 2021 16:40:17 +0000 (UTC) Received: from [192.168.0.2] (unknown [188.167.68.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 332C97A03FD; Mon, 14 Jun 2021 18:40:15 +0200 (CEST) From: Ondrej Zary To: "Christian =?utf-8?q?K=C3=B6nig?=" Date: Mon, 14 Jun 2021 18:40:12 +0200 User-Agent: KMail/1.9.10 References: <20210614110517.1624-1-christian.koenig@amd.com> In-Reply-To: <20210614110517.1624-1-christian.koenig@amd.com> X-KMail-QuotePrefix: > MIME-Version: 1.0 Content-Disposition: inline Message-Id: <202106141840.12702.linux@zary.sk> Subject: Re: [Nouveau] [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nouveau@lists.freedesktop.org, bskeggs@redhat.com, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" T24gTW9uZGF5IDE0IEp1bmUgMjAyMSAxMzowNToxNyBDaHJpc3RpYW4gS8O2bmlnIHdyb3RlOgo+ IEFHUCBmb3IgZXhhbXBsZSBkb2Vzbid0IGhhdmUgYSBkbWFfYWRkcmVzcyBhcnJheS4KPiAKPiBT aWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ CgpGaXhlcyBOVUxMIHBvaW50ZXIgZGVyZWZlcmVuY2UgaW4gbm91dmVhdV9ib19zeW5jX2Zvcl9k ZXZpY2Ugb24gQUdQIGNhcmRzLgoKVGVzdGVkLWJ5OiBPbmRyZWogWmFyeSA8bGludXhAemFyeS5z az4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYyB8IDQgKyst LQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+IAo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMgYi9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMKPiBpbmRleCAzZTA5ZGYwNDcyY2UuLjE3 MGFiYTk5YTExMCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1 X2JvLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMKPiBAQCAt NTQ2LDcgKzU0Niw3IEBAIG5vdXZlYXVfYm9fc3luY19mb3JfZGV2aWNlKHN0cnVjdCBub3V2ZWF1 X2JvICpudmJvKQo+ICAJc3RydWN0IHR0bV90dCAqdHRtX2RtYSA9IChzdHJ1Y3QgdHRtX3R0ICop bnZiby0+Ym8udHRtOwo+ICAJaW50IGksIGo7Cj4gIAo+IC0JaWYgKCF0dG1fZG1hKQo+ICsJaWYg KCF0dG1fZG1hIHx8ICF0dG1fZG1hLT5kbWFfYWRkcmVzcykKPiAgCQlyZXR1cm47Cj4gIAlpZiAo IXR0bV9kbWEtPnBhZ2VzKSB7Cj4gIAkJTlZfREVCVUcoZHJtLCAidHRtX2RtYSAweCVwOiBwYWdl cyBOVUxMXG4iLCB0dG1fZG1hKTsKPiBAQCAtNTgyLDcgKzU4Miw3IEBAIG5vdXZlYXVfYm9fc3lu Y19mb3JfY3B1KHN0cnVjdCBub3V2ZWF1X2JvICpudmJvKQo+ICAJc3RydWN0IHR0bV90dCAqdHRt X2RtYSA9IChzdHJ1Y3QgdHRtX3R0ICopbnZiby0+Ym8udHRtOwo+ICAJaW50IGksIGo7Cj4gIAo+ IC0JaWYgKCF0dG1fZG1hKQo+ICsJaWYgKCF0dG1fZG1hIHx8ICF0dG1fZG1hLT5kbWFfYWRkcmVz cykKPiAgCQlyZXR1cm47Cj4gIAlpZiAoIXR0bV9kbWEtPnBhZ2VzKSB7Cj4gIAkJTlZfREVCVUco ZHJtLCAidHRtX2RtYSAweCVwOiBwYWdlcyBOVUxMXG4iLCB0dG1fZG1hKTsKCgotLSAKT25kcmVq IFphcnkKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91 dmVhdSBtYWlsaW5nIGxpc3QKTm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg== 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=-14.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B587AC48BE6 for ; Mon, 14 Jun 2021 16:40:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CC9061078 for ; Mon, 14 Jun 2021 16:40:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CC9061078 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zary.sk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC6D66E02E; Mon, 14 Jun 2021 16:40:18 +0000 (UTC) Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by gabe.freedesktop.org (Postfix) with ESMTP id E1D5F89FCA; Mon, 14 Jun 2021 16:40:17 +0000 (UTC) Received: from [192.168.0.2] (unknown [188.167.68.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 332C97A03FD; Mon, 14 Jun 2021 18:40:15 +0200 (CEST) From: Ondrej Zary To: "Christian =?utf-8?q?K=C3=B6nig?=" Subject: Re: [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync Date: Mon, 14 Jun 2021 18:40:12 +0200 User-Agent: KMail/1.9.10 References: <20210614110517.1624-1-christian.koenig@amd.com> In-Reply-To: <20210614110517.1624-1-christian.koenig@amd.com> X-KMail-QuotePrefix: > MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <202106141840.12702.linux@zary.sk> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nouveau@lists.freedesktop.org, bskeggs@redhat.com, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Monday 14 June 2021 13:05:17 Christian K=C3=B6nig wrote: > AGP for example doesn't have a dma_address array. >=20 > Signed-off-by: Christian K=C3=B6nig =46ixes NULL pointer dereference in nouveau_bo_sync_for_device on AGP cards. Tested-by: Ondrej Zary > --- > drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouve= au/nouveau_bo.c > index 3e09df0472ce..170aba99a110 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -546,7 +546,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) > struct ttm_tt *ttm_dma =3D (struct ttm_tt *)nvbo->bo.ttm; > int i, j; > =20 > - if (!ttm_dma) > + if (!ttm_dma || !ttm_dma->dma_address) > return; > if (!ttm_dma->pages) { > NV_DEBUG(drm, "ttm_dma 0x%p: pages NULL\n", ttm_dma); > @@ -582,7 +582,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) > struct ttm_tt *ttm_dma =3D (struct ttm_tt *)nvbo->bo.ttm; > int i, j; > =20 > - if (!ttm_dma) > + if (!ttm_dma || !ttm_dma->dma_address) > return; > if (!ttm_dma->pages) { > NV_DEBUG(drm, "ttm_dma 0x%p: pages NULL\n", ttm_dma); =2D-=20 Ondrej Zary