diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-07-11 11:46:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-30 10:12:48 +0200 |
| commit | cb106d2a2c6b3d1d2459c0807b0d944983cbcc05 (patch) | |
| tree | 41375b5b7faea86f30ee87f4c38f932f993ca2ed | |
| parent | 3010fb28c8345a9c9d1b807e5d1b62c496d414ad (diff) | |
| download | linux-stable-cb106d2a2c6b3d1d2459c0807b0d944983cbcc05.tar.gz linux-stable-cb106d2a2c6b3d1d2459c0807b0d944983cbcc05.tar.bz2 linux-stable-cb106d2a2c6b3d1d2459c0807b0d944983cbcc05.zip | |
qxl: check for kmap failures
commit f4cceb2affcd1285d4ce498089e8a79f4cd2fa66 upstream.
If kmap fails, it leads to memory corruption.
Fixes: f64122c1f6ad ('drm: add new QXL driver. (v1.4)')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160711084633.GA31411@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_draw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c index 56e1d633875e..6e6c76080d6a 100644 --- a/drivers/gpu/drm/qxl/qxl_draw.c +++ b/drivers/gpu/drm/qxl/qxl_draw.c @@ -136,6 +136,8 @@ static int qxl_palette_create_1bit(struct qxl_bo *palette_bo, * correctly globaly, since that would require * tracking all of our palettes. */ ret = qxl_bo_kmap(palette_bo, (void **)&pal); + if (ret) + return ret; pal->num_ents = 2; pal->unique = unique++; if (visual == FB_VISUAL_TRUECOLOR || visual == FB_VISUAL_DIRECTCOLOR) { |