@@ -1,6 +1,6 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.4.71

+Version:	4.4.74

 Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

@@ -8,7 +8,7 @@ Group:		System Environment/Kernel

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:    	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e1803ee9837d8ef729601e71e1f51666366a3612

+%define sha1 linux=80b338e4442f57563dceb71be4acc1f5a5c234a0

 BuildArch:	noarch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

@@ -25,6 +25,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Wed Jun 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.74-1

+-   Update version

 *   Wed Jun 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.71-1

 -   Update version

 *   Thu May 25 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.70-1

@@ -1,6 +1,6 @@

 #

 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 4.4.71 Kernel Configuration

+# Linux/x86 4.4.74 Kernel Configuration

 #

 CONFIG_64BIT=y

 CONFIG_X86_64=y

@@ -1825,7 +1825,7 @@ CONFIG_DM_ZERO=m

 CONFIG_DM_MULTIPATH=m

 # CONFIG_DM_MULTIPATH_QL is not set

 # CONFIG_DM_MULTIPATH_ST is not set

-# CONFIG_DM_DELAY is not set

+CONFIG_DM_DELAY=m

 CONFIG_DM_UEVENT=y

 CONFIG_DM_FLAKEY=m

 CONFIG_DM_VERITY=m

@@ -3925,7 +3925,7 @@ CONFIG_CIFS_SMB2=y

 CONFIG_9P_FS=m

 # CONFIG_9P_FSCACHE is not set

 CONFIG_9P_FS_POSIX_ACL=y

-# CONFIG_9P_FS_SECURITY is not set

+CONFIG_9P_FS_SECURITY=y

 CONFIG_NLS=y

 CONFIG_NLS_DEFAULT="utf8"

 CONFIG_NLS_CODEPAGE_437=y

@@ -1500,7 +1500,7 @@ CONFIG_DM_MIRROR=m

 # CONFIG_DM_RAID is not set

 CONFIG_DM_ZERO=m

 # CONFIG_DM_MULTIPATH is not set

-# CONFIG_DM_DELAY is not set

+CONFIG_DM_DELAY=m

 CONFIG_DM_UEVENT=y

 # CONFIG_DM_FLAKEY is not set

 # CONFIG_DM_VERITY is not set

@@ -1,7 +1,7 @@

 %global security_hardening none

 Summary:       Kernel

 Name:          linux-esx

-Version:       4.4.71

+Version:       4.4.74

 Release:       1%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

@@ -9,7 +9,7 @@ Group:         System Environment/Kernel

 Vendor:        VMware, Inc.

 Distribution:  Photon

 Source0:       http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=e1803ee9837d8ef729601e71e1f51666366a3612

+%define sha1 linux=80b338e4442f57563dceb71be4acc1f5a5c234a0

 Source1:       config-esx

 Patch0:        double-tcp_mem-limits.patch

 Patch1:        linux-4.4-sysctl-sched_weighted_cpuload_uses_rla.patch

@@ -34,8 +34,6 @@ Patch19:       serial-8250-do-not-probe-U6-16550A-fifo-size.patch

 Patch20:       vmci-1.1.4.0-use-32bit-atomics-for-queue-headers.patch

 Patch21:       vmci-1.1.5.0-doorbell-create-and-destroy-fixes.patch

 Patch22:       net-9p-vsock.patch

-#fixes CVE-2017-7346

-Patch23:        vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch

 BuildRequires: bc

 BuildRequires: kbd

 BuildRequires: kmod

@@ -94,7 +92,6 @@ The Linux package contains the Linux kernel doc files

 %patch20 -p1

 %patch21 -p1

 %patch22 -p1

-%patch23 -p1

 %build

 # patch vmw_balloon driver

@@ -183,6 +180,9 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Jun 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.74-1

+-   [feature] DM Delay target support

+-   Fix CVE-2017-1000364 ("stack clash") and CVE-2017-9605

 *   Wed Jun 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.71-1

 -   Fix CVE-2017-8890, CVE-2017-9074, CVE-2017-9075, CVE-2017-9076

     CVE-2017-9077 and CVE-2017-9242

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:    	4.4.71

-Release:    	2%{?dist}

+Version:    	4.4.74

+Release:    	1%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution: 	Photon

 Source0:    	http://www.kernel.org/pub/linux/kernel/v4.x/%{name}-%{version}.tar.xz

-%define sha1 linux=e1803ee9837d8ef729601e71e1f51666366a3612

+%define sha1 linux=80b338e4442f57563dceb71be4acc1f5a5c234a0

 Source1:	config

 %define ena_version 1.1.3

 Source2:    	https://github.com/amzn/amzn-drivers/archive/ena_linux_1.1.3.tar.gz

@@ -33,8 +33,6 @@ Patch14:        vmxnet3-1.4.8.0-segCnt-can-be-1-for-LRO-packets.patch

 #fixes CVE-2016-6187

 Patch15:        apparmor-fix-oops-validate-buffer-size-in-apparmor_setprocattr.patch

 Patch16:        net-9p-vsock.patch

-#fixes CVE-2017-7346

-Patch17:        vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod

@@ -121,7 +119,6 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch14 -p1

 %patch15 -p1

 %patch16 -p1

-%patch17 -p1

 %build

 make mrproper

@@ -274,6 +271,10 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/perf-core

 %changelog

+*   Wed Jun 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.74-1

+-   [feature] 9P FS security support

+-   [feature] DM Delay target support

+-   Fix CVE-2017-1000364 ("stack clash") and CVE-2017-9605

 *   Mon Jun 19 2017 Anish Swaminathan <anishs@vmware.com>  4.4.71-2

 -   [feature] IPV6 netfilter NAT masquerade, security support

 *   Wed Jun 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.71-1

deleted file mode 100644

@@ -1,28 +0,0 @@

-The 'req->mip_levels' parameter in vmw_gb_surface_define_ioctl() is

-a user-controlled 'uint32_t' value which is used as a loop count limit.

-This can lead to a kernel lockup and DoS. Add check for 'req->mip_levels'.

-

-References:

-https://bugzilla.redhat.com/show_bug.cgi?id=1437431

-Signed-off-by: Vladis Dronov <vdronov at redhat.com>

- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++++

- 1 file changed, 4 insertions(+)

-

-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

-index b445ce9..b30824b 100644

-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

-@@ -1281,6 +1281,10 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,

- 	if (req->multisample_count != 0)

- 		return -EINVAL;

- 

-+	if (req->mip_levels > DRM_VMW_MAX_SURFACE_FACES *

-+		DRM_VMW_MAX_MIP_LEVELS)

-+		return -EINVAL;

-+

- 	if (unlikely(vmw_user_surface_size == 0))

- 		vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) +

- 			128;

-2.9.3