| From 6894a41b7add1cfa9a0bfb8ddab98cd8fd81f4f0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 8 Jun 2021 17:13:13 +0100 |
| Subject: drm: qxl: ensure surf.data is ininitialized |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit fbbf23ddb2a1cc0c12c9f78237d1561c24006f50 ] |
| |
| The object surf is not fully initialized and the uninitialized |
| field surf.data is being copied by the call to qxl_bo_create |
| via the call to qxl_gem_object_create. Set surf.data to zero |
| to ensure garbage data from the stack is not being copied. |
| |
| Addresses-Coverity: ("Uninitialized scalar variable") |
| Fixes: f64122c1f6ad ("drm: add new QXL driver. (v1.4)") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Link: http://patchwork.freedesktop.org/patch/msgid/20210608161313.161922-1-colin.king@canonical.com |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/qxl/qxl_dumb.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/qxl/qxl_dumb.c b/drivers/gpu/drm/qxl/qxl_dumb.c |
| index c04cd5a2553c..e377bdbff90d 100644 |
| --- a/drivers/gpu/drm/qxl/qxl_dumb.c |
| +++ b/drivers/gpu/drm/qxl/qxl_dumb.c |
| @@ -58,6 +58,8 @@ int qxl_mode_dumb_create(struct drm_file *file_priv, |
| surf.height = args->height; |
| surf.stride = pitch; |
| surf.format = format; |
| + surf.data = 0; |
| + |
| r = qxl_gem_object_create_with_handle(qdev, file_priv, |
| QXL_GEM_DOMAIN_SURFACE, |
| args->size, &surf, &qobj, |
| -- |
| 2.30.2 |
| |