diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2017-07-12 09:32:43 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2017-07-12 09:32:43 -0700 |
| commit | 98256c97e25a07e86af2da23cb1179f170b66552 (patch) | |
| tree | 948d2adf9c1fedb8a78a05512bd3b28d653f4d31 | |
| parent | 8170661ca5737752e65280f7e93c31b9f1bafc69 (diff) | |
| download | kernel-98256c97e25a07e86af2da23cb1179f170b66552.tar.gz kernel-98256c97e25a07e86af2da23cb1179f170b66552.tar.xz kernel-98256c97e25a07e86af2da23cb1179f170b66552.zip | |
Linux v4.11.10
| -rw-r--r-- | 0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch | 34 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 39 deletions
diff --git a/0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch b/0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch deleted file mode 100644 index a2e0fec2c..000000000 --- a/0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 385aee965b4e4c36551c362a334378d2985b722a Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <kraxel@redhat.com> -Date: Thu, 6 Apr 2017 17:59:40 +0200 -Subject: [PATCH] drm/virtio: don't leak bo on drm_gem_object_init failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Reported-by: 李强 <liqiang6-s@360.cn> -Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> -Link: http://patchwork.freedesktop.org/patch/msgid/20170406155941.458-1-kraxel@redhat.com ---- - drivers/gpu/drm/virtio/virtgpu_object.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c -index 1483dae..6f66b73 100644 ---- a/drivers/gpu/drm/virtio/virtgpu_object.c -+++ b/drivers/gpu/drm/virtio/virtgpu_object.c -@@ -81,8 +81,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, - return -ENOMEM; - size = roundup(size, PAGE_SIZE); - ret = drm_gem_object_init(vgdev->ddev, &bo->gem_base, size); -- if (ret != 0) -+ if (ret != 0) { -+ kfree(bo); - return ret; -+ } - bo->dumb = false; - virtio_gpu_init_ttm_placement(bo, pinned); - --- -2.9.4 - diff --git a/kernel.spec b/kernel.spec index 9820966e5..da06e74cb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 9 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -666,9 +666,6 @@ Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch # rhbz 1459326 Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch -#CVE-2017-10810 rhbz 1468023 1468024 -Patch684: 0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch - # rhbz 1458599 Patch685: 0001-ACPI-LPSS-Only-call-pwm_add_table-for-the-first-PWM-.patch @@ -2237,6 +2234,9 @@ fi # # %changelog +* Wed Jul 12 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.10-300 +- Linux v4.11.10 + * Mon Jul 10 2017 Laura Abbott <labbott@fedoraproject.org> - Only call pwm_add_table for the first PWM controller (rhbz 1458599) @@ -1,3 +1,3 @@ SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 -SHA512 (patch-4.11.9.xz) = 0d9474810b175679ae1a6e1c59ea60da8d2c5fafdd736a827cf1abe5bbd99361a31a4584d3bc160ed83322d7876e822dbd537adf12c22a2dcec45acfcd645bca +SHA512 (patch-4.11.10.xz) = b1f1913650bd98888b88dd78cdc8e81f14414a98717f103a0aa631fe7b9e630e63e59b26b3047f6530c43ecc82ee7c2db17c70f24898ae892a473af5be222dc2 |