Christian König
2021-Jun-14 11:05 UTC
[Nouveau] [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync
AGP for example doesn't have a dma_address array.
Signed-off-by: Christian K?nig <christian.koenig at amd.com>
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/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 = (struct ttm_tt *)nvbo->bo.ttm;
int i, j;
- 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 = (struct ttm_tt *)nvbo->bo.ttm;
int i, j;
- 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);
--
2.25.1
Ondrej Zary
2021-Jun-14 16:40 UTC
[Nouveau] [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync
On Monday 14 June 2021 13:05:17 Christian K?nig wrote:> AGP for example doesn't have a dma_address array. > > Signed-off-by: Christian K?nig <christian.koenig at amd.com>Fixes NULL pointer dereference in nouveau_bo_sync_for_device on AGP cards. Tested-by: Ondrej Zary <linux at zary.sk>> --- > drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/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 = (struct ttm_tt *)nvbo->bo.ttm; > int i, j; > > - 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 = (struct ttm_tt *)nvbo->bo.ttm; > int i, j; > > - 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);-- Ondrej Zary
Christian König
2021-Jun-22 09:32 UTC
[Nouveau] [PATCH] drm/nouveau: fix dma_address check for CPU/GPU sync
Ping? Does anybody wants to give me an rb or acked-by? AGP is basically broken on nouveu without this. Christian. Am 14.06.21 um 13:05 schrieb Christian K?nig:> AGP for example doesn't have a dma_address array. > > Signed-off-by: Christian K?nig <christian.koenig at amd.com> > --- > drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/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 = (struct ttm_tt *)nvbo->bo.ttm; > int i, j; > > - 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 = (struct ttm_tt *)nvbo->bo.ttm; > int i, j; > > - 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);