[patch] drm/nouveau: off by one in nouveau_drm_vblank_enable()

Maarten Lankhorst maarten.lankhorst at canonical.com
Wed Apr 3 04:33:09 PDT 2013


Op 03-04-13 10:05, Dan Carpenter schreef:
> The test here should be ">= ARRAY_SIZE()" instead of "> ARRAY_SIZE()".
>
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
> ---
> This was introduced in git://git.freedesktop.org/git/nouveau/linux-2.6 drm-nouveau-fixes-3.9
> It hadn't hit linux-next yet yesterday.
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
> index c95decf..e11f8e4 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
> @@ -86,7 +86,7 @@ nouveau_drm_vblank_enable(struct drm_device *dev, int head)
>  	struct nouveau_drm *drm = nouveau_drm(dev);
>  	struct nouveau_disp *pdisp = nouveau_disp(drm->device);
>  
> -	if (WARN_ON_ONCE(head > ARRAY_SIZE(drm->vblank)))
> +	if (WARN_ON_ONCE(head >= ARRAY_SIZE(drm->vblank)))
>  		return -EIO;
>  	WARN_ON_ONCE(drm->vblank[head].func);
>  	drm->vblank[head].func = nouveau_drm_vblank_handler;
>



More information about the dri-devel mailing list