summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_fbcon.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-06-02 05:23:31 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-27 19:47:34 +0300
commitfbf9b544a2bc0900142c723b804889aa0f35216c (patch)
tree07f961ee068873c3df35f6a7611e79fa8ba2f2c1 /drivers/gpu/drm/nouveau/nouveau_fbcon.c
parentc8c3b35d3e3b1c750866e0c724711ef333652eb5 (diff)
downloadlinux-fbf9b544a2bc0900142c723b804889aa0f35216c.tar.xz
drm/nouveau/fbcon: fix out-of-bounds memory accesses
commit f045f459d925138fe7d6193a8c86406bda7e49da upstream. Reported by KASAN. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_fbcon.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 59f27e774acb..bd89c8656c93 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -557,6 +557,7 @@ nouveau_fbcon_init(struct drm_device *dev)
if (ret)
goto fini;
+ fbcon->helper.fbdev->pixmap.buf_align = 4;
return 0;
fini: