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

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.9.140

+Version:	4.9.154

 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=926d3d735f9d531fece00241845cfbab25eb273e

+%define sha1 linux=1a506bd238df9dbdc81e6b74abc0bb751a45eb5b

 BuildArch:	noarch

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

 %description

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

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Mon Feb 04 2019 Ajay Kaher <akaher@vmware.com> 4.9.154-1

+-   Update to version 4.9.154

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

 -   Update to version 4.9.140

 *   Fri Nov 16 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.9.137-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 e10f616..c94d5a9 100644

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

-@@ -488,6 +488,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)) {

-@@ -2534,7 +2537,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

-

deleted file mode 100644

@@ -1,148 +0,0 @@

-From 34ec80907c239ae294ed85da2958ecf287986009 Mon Sep 17 00:00:00 2001

-From: "Chao Yu Date: Wed, 22 Mar 2017 14:45:05 +0800" <yuchao0@huawei.com>

-Date: Mon, 16 Jul 2018 20:11:52 +0530

-Subject: [PATCH 1/2] f2fs: fix race condition in between free nid

- allocator/initializer

-

-In below concurrent case, allocated nid can be loaded into free nid cache

-and be allocated again.

-

-Thread A                                Thread B

-- f2fs_create

- - f2fs_new_inode

-  - alloc_nid

-   - __insert_nid_to_list(ALLOC_NID_LIST)

-                                        - f2fs_balance_fs_bg

-                                         - build_free_nids

-                                          - __build_free_nids

-                                           - scan_nat_page

-                                            - add_free_nid

-                                             - __lookup_nat_cache

- - f2fs_add_link

-  - init_inode_metadata

-   - new_inode_page

-    - new_node_page

-     - set_node_addr

- - alloc_nid_done

-  - __remove_nid_from_list(ALLOC_NID_LIST)

-                                             - __insert_nid_to_list(FREE_NID_LIST)

-

-This patch makes nat cache lookup and free nid list operation being atomical

-to avoid this race condition.

-

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

-Signed-off-by: Chao Yu <yuchao0@huawei.com>

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

-

-[ Srinidhi Rao : Backported this fix to 4.9 ]

-Signed-off-by: srinidhira0 <srinidhir@vmware.com>

- fs/f2fs/node.c | 75 ++++++++++++++++++++++++++++++++++++++++++----------------

- 1 file changed, 54 insertions(+), 21 deletions(-)

-

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

-index 01177ec..653461e 100644

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

-@@ -1702,8 +1702,10 @@ static void __del_from_free_nid_list(struct f2fs_nm_info *nm_i,

- static int add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)

- {

- 	struct f2fs_nm_info *nm_i = NM_I(sbi);

--	struct free_nid *i;

-+	struct free_nid *i, *e;

- 	struct nat_entry *ne;

-+	int err = -EINVAL;

-+	int ret = 0;

- 

- 	if (!available_free_memory(sbi, FREE_NIDS))

- 		return -1;

-@@ -1712,35 +1714,66 @@ static int add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)

- 	if (unlikely(nid == 0))

- 		return 0;

- 

--	if (build) {

--		/* do not add allocated nids */

--		ne = __lookup_nat_cache(nm_i, nid);

--		if (ne && (!get_nat_flag(ne, IS_CHECKPOINTED) ||

--				nat_get_blkaddr(ne) != NULL_ADDR))

--			return 0;

--	}

--

- 	i = f2fs_kmem_cache_alloc(free_nid_slab, GFP_NOFS);

- 	i->nid = nid;

- 	i->state = NID_NEW;

- 

--	if (radix_tree_preload(GFP_NOFS)) {

--		kmem_cache_free(free_nid_slab, i);

--		return 0;

--	}

-+	if (radix_tree_preload(GFP_NOFS))

-+		goto err;

- 

- 	spin_lock(&nm_i->free_nid_list_lock);

--	if (radix_tree_insert(&nm_i->free_nid_root, i->nid, i)) {

--		spin_unlock(&nm_i->free_nid_list_lock);

--		radix_tree_preload_end();

--		kmem_cache_free(free_nid_slab, i);

--		return 0;

-+

-+	if (build) {

-+

-+		/*

-+		 *   Thread A             Thread B

-+		 *  - f2fs_create

-+		 *   - f2fs_new_inode

-+		 *    - alloc_nid

-+		 *     - __insert_nid_to_list(ALLOC_NID_LIST)

-+		 *                     - f2fs_balance_fs_bg

-+		 *                      - build_free_nids

-+		 *                       - __build_free_nids

-+		 *                        - scan_nat_page

-+		 *                         - add_free_nid

-+		 *                          - __lookup_nat_cache

-+		 *  - f2fs_add_link

-+		 *   - init_inode_metadata

-+		 *    - new_inode_page

-+		 *     - new_node_page

-+		 *      - set_node_addr

-+		 *  - alloc_nid_done

-+		 *   - __remove_nid_from_list(ALLOC_NID_LIST)

-+		 *                         - __insert_nid_to_list(FREE_NID_LIST)

-+		 */

-+		ne = __lookup_nat_cache(nm_i, nid);

-+		if (ne && (!get_nat_flag(ne, IS_CHECKPOINTED) ||

-+					nat_get_blkaddr(ne) != NULL_ADDR))

-+			goto err_out;

-+

-+		e = __lookup_free_nid_list(nm_i, nid);

-+		if (e) {

-+			if (e->state == NID_NEW)

-+				ret = 1;

-+			goto err_out;

-+		}

- 	}

--	list_add_tail(&i->list, &nm_i->free_nid_list);

--	nm_i->fcnt++;

-+	ret = 1;

-+

-+	err = radix_tree_insert(&nm_i->free_nid_root, i->nid, i);

-+	if (!err) {

-+		list_add_tail(&i->list, &nm_i->free_nid_list);

-+		nm_i->fcnt++;

-+

-+	}

-+err_out:

- 	spin_unlock(&nm_i->free_nid_list_lock);

- 	radix_tree_preload_end();

--	return 1;

-+err:

-+	if (err)

-+		kmem_cache_free(free_nid_slab, i);

-+

-+	return ret;

- }

- 

- static void remove_free_nid(struct f2fs_nm_info *nm_i, nid_t nid)

-2.7.4

-

@@ -4542,7 +4542,7 @@ index a260cde..1b99d3b 100644

 -static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)

 +static int param_set_kgdboc_var(const char *kmessage, const struct kernel_param *kp)

  {

- 	int len = strlen(kmessage);

+ 	size_t len = strlen(kmessage);

 diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c

 index b90ef96..12f6ec5 100644

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-aws

-Version:        4.9.140

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

+Version:        4.9.154

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

-%define sha1 linux=926d3d735f9d531fece00241845cfbab25eb273e

+%define sha1 linux=1a506bd238df9dbdc81e6b74abc0bb751a45eb5b

 Source1:	config-aws

 Source2:	initramfs.trigger

 # common

@@ -52,13 +52,9 @@ Patch34:        0001-net-create-skb_gso_validate_mac_len.patch

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

 # Fix for CVE-2018-8043

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

-# Fix for CVE-2017-18241

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

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

 # Fix for CVE-2017-18232

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

-# Fix for CVE-2017-18249

-Patch44:        0001-f2fs-fix-race-condition-in-between-free-nid-allocator-initializer.patch

 # Fix for CVE-2018-10323

 Patch45:        0001-xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch

 # Fix for CVE-2018-10322

@@ -223,10 +219,8 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch34 -p1

 %patch35 -p1

 %patch38 -p1

-%patch40 -p1

 %patch42 -p1

 %patch43 -p1

-%patch44 -p1

 %patch45 -p1

 %patch46 -p1

 %patch47 -p1

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

 /usr/share/doc/*

 %changelog

+*   Mon Feb 04 2019 Ajay Kaher <akaher@vmware.com> 4.9.154-1

+-   Update to version 4.9.154

 *   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-2

 -   .config: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS

 -   Removed deprecated -q option for depmod

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-esx

-Version:        4.9.140

-Release:        3%{?dist}

+Version:        4.9.154

+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=926d3d735f9d531fece00241845cfbab25eb273e

+%define sha1 linux=1a506bd238df9dbdc81e6b74abc0bb751a45eb5b

 Source1:        config-esx

 Source2:        initramfs.trigger

 # common

@@ -48,13 +48,9 @@ Patch34:        0001-net-create-skb_gso_validate_mac_len.patch

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

 # Fix for CVE-2018-8043

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

-# Fix for CVE-2017-18241

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

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

 # Fix for CVE-2017-18232

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

-# Fix for CVE-2017-18249

-Patch44:        0001-f2fs-fix-race-condition-in-between-free-nid-allocator-initializer.patch

 # Fix for CVE-2018-10323

 Patch45:        0001-xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch

 # Fix for CVE-2018-10322

@@ -130,10 +126,8 @@ The Linux package contains the Linux kernel doc files

 %patch34 -p1

 %patch35 -p1

 %patch38 -p1

-%patch40 -p1

 %patch42 -p1

 %patch43 -p1

-%patch44 -p1

 %patch45 -p1

 %patch46 -p1

 %patch47 -p1

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

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

 %changelog

+*   Mon Feb 04 2019 Ajay Kaher <akaher@vmware.com> 4.9.154-1

+-   Update to version 4.9.154

 *   Tue Jan 08 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.9.140-3

 -   Read TSC only during the startup of the boot-CPU.

 *   Mon Dec 03 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-2

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-secure

-Version:        4.9.140

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

+Version:        4.9.154

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

-%define sha1 linux=926d3d735f9d531fece00241845cfbab25eb273e

+%define sha1 linux=1a506bd238df9dbdc81e6b74abc0bb751a45eb5b

 Source1:        config-secure

 Source2:        aufs4.9.tar.gz

 %define sha1 aufs=ebe716ce4b638a3772c7cd3161abbfe11d584906

@@ -58,13 +58,9 @@ Patch36:        0001-net-create-skb_gso_validate_mac_len.patch

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

 # Fix for CVE-2018-8043

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

-# Fix for CVE-2017-18241

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

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

 # Fix for CVE-2017-18232

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

-# Fix for CVE-2017-18249

-Patch46:        0001-f2fs-fix-race-condition-in-between-free-nid-allocator-initializer.patch

 # Fix for CVE-2018-10323

 Patch47:        0001-xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch

 # Fix for CVE-2018-10322

@@ -189,10 +185,8 @@ EOF

 %patch36 -p1

 %patch37 -p1

 %patch40 -p1

-%patch42 -p1

 %patch44 -p1

 %patch45 -p1

-%patch46 -p1

 %patch47 -p1

 %patch48 -p1

 %patch49 -p1

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

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

 %changelog

+*   Mon Feb 04 2019 Ajay Kaher <akaher@vmware.com> 4.9.154-1

+-   Update to version 4.9.154

 *   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-3

 -   .config: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS

 *   Thu Dec 20 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-2

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:        4.9.140

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

+Version:        4.9.154

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

-%define sha1 linux=926d3d735f9d531fece00241845cfbab25eb273e

+%define sha1 linux=1a506bd238df9dbdc81e6b74abc0bb751a45eb5b

 Source1:	config

 Source2:	initramfs.trigger

 %define ena_version 1.1.3

@@ -56,14 +56,10 @@ Patch34:        0001-net-create-skb_gso_validate_mac_len.patch

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

 # Fix for CVE-2018-8043

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

-# Fix for CVE-2017-18241

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

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

 # Fix for CVE-2017-18232

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

-# Fix for CVE-2017-18249

-Patch44:        0001-f2fs-fix-race-condition-in-between-free-nid-allocator-initializer.patch

 # Fix for CVE-2018-10323

 Patch45:        0001-xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch

 # Fix for CVE-2018-10322

@@ -189,10 +185,8 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch34 -p1

 %patch35 -p1

 %patch38 -p1

-%patch40 -p1

 %patch42 -p1

 %patch43 -p1

-%patch44 -p1

 %patch45 -p1

 %patch46 -p1

 %patch47 -p1

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

 /usr/share/doc/*

 %changelog

+*   Mon Feb 04 2019 Ajay Kaher <akaher@vmware.com> 4.9.154-1

+-   Update to version 4.9.154

 *   Wed Jan 23 2019 Ajay Kaher <akaher@vmware.com> 4.9.140-6

 -   Fix IRQ issue by using effective_affinity

 -   Remove nvme_io_irq_without_affinity.patch