Linux v4.11-rc5-41-gaeb4a57

This commit is contained in:
Laura Abbott 2017-04-05 09:15:01 -07:00
parent af8a9aac1b
commit 1039af70c6
4 changed files with 6 additions and 39 deletions

2
gitrev
View File

@ -1 +1 @@
08e4e0d0456d0ca8427b2d1ddffa30f1c3e774d7 aeb4a5768179f525dd7ec9393f34012c147e78cf

View File

@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%global rcrev 5 %global rcrev 5
# The git snapshot level # The git snapshot level
%define gitrev 1 %define gitrev 2
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0 %define rpmversion 4.%{upstream_sublevel}.0
%endif %endif
@ -602,9 +602,6 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch
#CVE-2016-3134 rhbz 1317383 1317384 #CVE-2016-3134 rhbz 1317383 1317384
Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
#CVE-2017-7261 rhbz 1435719 1435740
Patch670: vmwgfx-check-that-number-of-mip-levels-is-above-zero.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%endif %endif
@ -2169,6 +2166,9 @@ fi
# #
# #
%changelog %changelog
* Wed Apr 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc5.git2.1
- Linux v4.11-rc5-41-gaeb4a57
* Tue Apr 4 2017 Peter Robinson <pbrobinson@fedoraproject.org> * Tue Apr 4 2017 Peter Robinson <pbrobinson@fedoraproject.org>
- Update AllWinner configs - Update AllWinner configs

View File

@ -1,4 +1,4 @@
SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
SHA512 (patch-4.11-rc5.xz) = 9b8b728eb8bb679d012c90f878739f02a3c9d13eb916248550fc61fad5a7ac5a0aee9c8166ff0c8b3180b96679f69ffbb5f79992f02a1693fd2c3616df1f6dd1 SHA512 (patch-4.11-rc5.xz) = 9b8b728eb8bb679d012c90f878739f02a3c9d13eb916248550fc61fad5a7ac5a0aee9c8166ff0c8b3180b96679f69ffbb5f79992f02a1693fd2c3616df1f6dd1
SHA512 (patch-4.11-rc5-git1.xz) = 5342b95a17ba165ffab8f70b7e27218c52a5a1b0ec8ccb474bd353bec6833006e7d4f7049140eea653eaf92535a6b8049a27b7a35a89b8beaf8681382211242d SHA512 (patch-4.11-rc5-git2.xz) = a6473855aa5d9d684a06c7ba8c536c8e7654487184b64cadbe5945352d3bda3b3fbc63424c62f60d655fb9283bbd583d429a4e287be5651e9f8fedab34fa1f74

View File

@ -1,33 +0,0 @@
From: Vladis Dronov <vdronov@redhat.com>
Subject: [PATCH] drm/vmwgfx: Check check that number of mip levels is above zero in vmw_surface_define_ioctl()
Date: 2017-03-24 15:37:10
In vmw_surface_define_ioctl(), a num_sizes parameter is assigned a
user-controlled value which is not checked for zero. It is used in
a call to kmalloc() which returns ZERO_SIZE_PTR. Later ZERO_SIZE_PTR
is dereferenced which leads to a GPF and possibly to a kernel panic.
Add the check for zero to avoid this.
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1435719
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index b445ce9..42840cc 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -716,8 +716,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
num_sizes += req->mip_levels[i];
- if (num_sizes > DRM_VMW_MAX_SURFACE_FACES *
- DRM_VMW_MAX_MIP_LEVELS)
+ if (num_sizes <= 0 ||
+ num_sizes > DRM_VMW_MAX_SURFACE_FACES * DRM_VMW_MAX_MIP_LEVELS)
return -EINVAL;
size = vmw_user_surface_size + 128 +
--
2.9.3