From: Greg Kroah-Hartman Date: Mon, 4 May 2020 09:12:07 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.4.222~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fd3983ee55e4451bed0b496e20fb6866365a3bb;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: drm-qxl-qxl_release-leak-in-qxl_hw_surface_alloc.patch --- diff --git a/queue-4.4/drm-qxl-qxl_release-leak-in-qxl_hw_surface_alloc.patch b/queue-4.4/drm-qxl-qxl_release-leak-in-qxl_hw_surface_alloc.patch new file mode 100644 index 00000000000..e0619af4831 --- /dev/null +++ b/queue-4.4/drm-qxl-qxl_release-leak-in-qxl_hw_surface_alloc.patch @@ -0,0 +1,35 @@ +From a65aa9c3676ffccb21361d52fcfedd5b5ff387d7 Mon Sep 17 00:00:00 2001 +From: Vasily Averin +Date: Mon, 27 Apr 2020 08:32:51 +0300 +Subject: drm/qxl: qxl_release leak in qxl_hw_surface_alloc() + +From: Vasily Averin + +commit a65aa9c3676ffccb21361d52fcfedd5b5ff387d7 upstream. + +Cc: stable@vger.kernel.org +Fixes: 8002db6336dd ("qxl: convert qxl driver to proper use for reservations") +Signed-off-by: Vasily Averin +Link: http://patchwork.freedesktop.org/patch/msgid/2e5a13ae-9ab2-5401-aa4d-03d5f5593423@virtuozzo.com +Signed-off-by: Gerd Hoffmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/qxl/qxl_cmd.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/qxl/qxl_cmd.c ++++ b/drivers/gpu/drm/qxl/qxl_cmd.c +@@ -500,9 +500,10 @@ int qxl_hw_surface_alloc(struct qxl_devi + return ret; + + ret = qxl_release_reserve_list(release, true); +- if (ret) ++ if (ret) { ++ qxl_release_free(qdev, release); + return ret; +- ++ } + cmd = (struct qxl_surface_cmd *)qxl_release_map(qdev, release); + cmd->type = QXL_SURFACE_CMD_CREATE; + cmd->flags = QXL_SURF_FLAG_KEEP_DATA; diff --git a/queue-4.4/series b/queue-4.4/series index 6a92190e3f3..f35a4ca8511 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1 +1,2 @@ ext4-fix-special-inode-number-checks-in-__ext4_iget.patch +drm-qxl-qxl_release-leak-in-qxl_hw_surface_alloc.patch