diff options
| author |   Dmitrii Tcvetkov <demfloro@demfloro.ru> | 2016-06-20 13:52:14 +0300 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2016-06-24 07:51:32 +1000 |
| commit | 52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216 (patch) | |
| tree | cd6573b6dc893648d03651168954dc18119cd0a1 /drivers | |
| parent | drm/nouveau/iccsense: fix memory leak (diff) | |
| download | linux-dev-52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216.tar.xz linux-dev-52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216.zip | |
drm/nouveau: fix for disabled fbdev emulation
Hello,
after this commit:
commit f045f459d925138fe7d6193a8c86406bda7e49da
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Thu Jun 2 12:23:31 2016 +1000
drm/nouveau/fbcon: fix out-of-bounds memory accesses
kernel started to oops when loading nouveau module when using GTX 780 Ti
video adapter. This patch fixes the problem.
Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=120591
Signed-off-by: Dmitrii Tcvetkov <demfloro@demfloro.ru>
Suggested-by: Ilia Mirkin <imirkin@alum.mit.edu>
Fixes: f045f459d925 ("nouveau_fbcon_init()")
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 300ea03be8f0..d1f248fd3506 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -552,7 +552,8 @@ nouveau_fbcon_init(struct drm_device *dev) if (ret) goto fini; - fbcon->helper.fbdev->pixmap.buf_align = 4; + if (fbcon->helper.fbdev) + fbcon->helper.fbdev->pixmap.buf_align = 4; return 0; fini: |