[PATCH] drm/nouveau: fix crash with noaccel=1

[PATCH] drm/nouveau: fix crash with noaccel=1

[Marcin Slusarz]

Reported-by: Ortwin Glück <odi@odi.ch>
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
---
 drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index cc79c79..cbf1fc6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -241,6 +241,10 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
 
 	if (unlikely(!abi16))
 		return -ENOMEM;
+
+	if (!drm->channel)
+		return nouveau_abi16_put(abi16, -ENODEV);
+
 	client = nv_client(abi16->client);
 
 	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
-- 
1.7.12

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau

Re: [PATCH] drm/nouveau: fix crash with noaccel=1

[Ortwin Glück]

I am confirming that it fixes the problem.

Thanks!

Ortwin

On 11.11.2012 20:00, Marcin Slusarz wrote:
>
> Reported-by: Ortwin Glück <odi@odi.ch>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> ---
>   drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
> index cc79c79..cbf1fc6 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
> @@ -241,6 +241,10 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
>
>   	if (unlikely(!abi16))
>   		return -ENOMEM;
> +
> +	if (!drm->channel)
> +		return nouveau_abi16_put(abi16, -ENODEV);
> +
>   	client = nv_client(abi16->client);
>
>   	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
>
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau