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

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.4.164

+Version:	4.4.171

 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=33ac0f11bcb49515bd6e2c4c841c25cb62d735de

+%define sha1 linux=0dad29240a55b758c2ebe81ce43b4766b7d81f7d

 BuildArch:	noarch

 # From SPECS/linux and used by linux-esx only

 # It provides f*xattrat syscalls

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

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Thu Jan 24 2019 Ajay Kaher <akaher@vmware.com> 4.4.171-1

+-   Update to version 4.4.171

 *   Mon Nov 26 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.4.164-1

 -   Update to version 4.4.164

 *   Wed Nov 14 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.4.163-1

deleted file mode 100644

@@ -1,47 +0,0 @@

-From d4fdf8ba0e5808ba9ad6b44337783bd9935e0982 Mon Sep 17 00:00:00 2001

-From: Yunlei He <heyunlei@huawei.com>

-Date: Thu, 1 Jun 2017 16:43:51 +0800

-Subject: [PATCH] f2fs: fix a panic caused by NULL flush_cmd_control

-

-Mount fs with option noflush_merge, boot failed for illegal address

-fcc in function f2fs_issue_flush:

-

-        if (!test_opt(sbi, FLUSH_MERGE)) {

-                ret = submit_flush_wait(sbi);

-                atomic_inc(&fcc->issued_flush);   ->  Here, fcc illegal

-                return ret;

-        }

-

-Signed-off-by: Yunlei He <heyunlei@huawei.com>

-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

-Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

- fs/f2fs/segment.c | 5 ++++-

- 1 file changed, 4 insertions(+), 1 deletion(-)

-

-diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c

-index f77b325..87406ef 100644

-+++ b/fs/f2fs/segment.c

-@@ -395,6 +395,9 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)

- 	init_waitqueue_head(&fcc->flush_wait_queue);

- 	init_llist_head(&fcc->issue_list);

- 	SM_I(sbi)->cmd_control_info = fcc;

-+	if (!test_opt(sbi, FLUSH_MERGE))

-+		return err;

-+

- 	fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi,

- 				"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));

- 	if (IS_ERR(fcc->f2fs_issue_flush)) {

-@@ -2313,7 +2316,7 @@ int build_segment_manager(struct f2fs_sb_info *sbi)

- 

- 	INIT_LIST_HEAD(&sm_info->sit_entry_set);

- 

--	if (test_opt(sbi, FLUSH_MERGE) && !f2fs_readonly(sbi->sb)) {

-+	if (!f2fs_readonly(sbi->sb)) {

- 		err = create_flush_cmd_control(sbi);

- 		if (err)

- 			return err;

-2.7.4

-

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

 %global security_hardening none

 Summary:       Kernel

 Name:          linux-esx

-Version:       4.4.164

-Release:       2%{?dist}

+Version:       4.4.171

+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/linux-%{version}.tar.xz

-%define sha1 linux=33ac0f11bcb49515bd6e2c4c841c25cb62d735de

+%define sha1 linux=0dad29240a55b758c2ebe81ce43b4766b7d81f7d

 Source1:       config-esx

 Patch0:        double-tcp_mem-limits.patch

 Patch1:        linux-4.4-sysctl-sched_weighted_cpuload_uses_rla.patch

@@ -41,8 +41,7 @@ Patch27:       0001-net-create-skb_gso_validate_mac_len.patch

 Patch28:       0002-bnx2x-disable-GSO-where-gso_size-is-too-big-for-hard.patch

 # Fix for CVE-2018-8043

 Patch30:       0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch

-# Fix for CVE-2017-18241

-Patch33:       0001-f2fs-fix-a-panic-caused-by-NULL-flush_cmd_control.patch

+

 Patch34:       0001-hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

 # Fix for CVE-2017-18232

 Patch35:       0001-scsi-libsas-direct-call-probe-and-destruct.patch

@@ -130,7 +129,6 @@ The Linux package contains the Linux kernel doc files

 %patch27 -p1

 %patch28 -p1

 %patch30 -p1

-%patch33 -p1

 %patch34 -p1

 %patch35 -p1

 %patch36 -p1

@@ -237,6 +235,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

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

 %changelog

+*   Thu Jan 24 2019 Ajay Kaher <akaher@vmware.com> 4.4.171-1

+-   Update to version 4.4.171

 *   Wed Dec 12 2018 Kamal Charan <kcharan@vmware.com> 4.4.164-2

 -   Add 9p zero copy data path using crossfd

 *   Mon Nov 26 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.4.164-1

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:    	4.4.164

-Release:        4%{?kat_build:.%kat_build}%{?dist}

+Version:    	4.4.171

+Release:        1%{?kat_build:.%kat_build}%{?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=33ac0f11bcb49515bd6e2c4c841c25cb62d735de

+%define sha1 linux=0dad29240a55b758c2ebe81ce43b4766b7d81f7d

 Source1:	config

 %define ena_version 1.1.3

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

@@ -40,8 +40,6 @@ Patch19:        0001-net-create-skb_gso_validate_mac_len.patch

 Patch20:        0002-bnx2x-disable-GSO-where-gso_size-is-too-big-for-hard.patch

 # Fix for CVE-2018-8043

 Patch22:        0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch

-# Fix for CVE-2017-18241

-Patch25:        0001-f2fs-fix-a-panic-caused-by-NULL-flush_cmd_control.patch

 Patch26:        Implement-the-f-xattrat-family-of-functions.patch

 Patch27:        0001-hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

 # Fix for CVE-2017-18232

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

 %patch19 -p1

 %patch20 -p1

 %patch22 -p1

-%patch25 -p1

 %patch26 -p1

 %patch27 -p1

 %patch28 -p1

@@ -338,6 +335,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/perf-core

 %changelog

+*   Thu Jan 24 2019 Ajay Kaher <akaher@vmware.com> 4.4.171-1

+-   Update to version 4.4.171

 *   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.4.164-4

 -   .config: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS

 -   Removed deprecated -q option for depmod