Nouveau - Jan 2020 - [PATCH] drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler

Like other cases, it should use rcu protected 'chan' rather
than 'fence->channel' in nouveau_fence_wait_uevent_handler.

Fixes: 0ec5f02f0e2c ("drm/nouveau: prevent stale fence->channel
pointers, and protect with rcu")
Signed-off-by: YueHaibing <yuehaibing at huawei.com>
---
 drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 9118df0..70bb6bb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -156,7 +156,7 @@ nouveau_fence_wait_uevent_handler(struct nvif_notify
*notify)
 
 		fence = list_entry(fctx->pending.next, typeof(*fence), head);
 		chan = rcu_dereference_protected(fence->channel,
lockdep_is_held(&fctx->lock));
-		if (nouveau_fence_update(fence->channel, fctx))
+		if (nouveau_fence_update(chan, fctx))
 			ret = NVIF_NOTIFY_DROP;
 	}
 	spin_unlock_irqrestore(&fctx->lock, flags);
-- 
2.7.4

On Fri, 10 Jan 2020 at 16:51, YueHaibing <yuehaibing at huawei.com>
wrote:
>
> Like other cases, it should use rcu protected 'chan' rather
> than 'fence->channel' in nouveau_fence_wait_uevent_handler.
>
> Fixes: 0ec5f02f0e2c ("drm/nouveau: prevent stale fence->channel
pointers, and protect with rcu")
> Signed-off-by: YueHaibing <yuehaibing at huawei.com>
Got it, thanks!
> ---
>  drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
> index 9118df0..70bb6bb 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_fence.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
> @@ -156,7 +156,7 @@ nouveau_fence_wait_uevent_handler(struct nvif_notify
*notify)
>
>                 fence = list_entry(fctx->pending.next, typeof(*fence),
head);
>                 chan = rcu_dereference_protected(fence->channel,
lockdep_is_held(&fctx->lock));
> -               if (nouveau_fence_update(fence->channel, fctx))
> +               if (nouveau_fence_update(chan, fctx))
>                         ret = NVIF_NOTIFY_DROP;
>         }
>         spin_unlock_irqrestore(&fctx->lock, flags);
> --
> 2.7.4
>
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau