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

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.19.52

+Version:	4.19.65

 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=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+%define sha1 linux=598111781858ea0aaa328cfa0fec39264d2815d7

 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

+*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1

+-   Update to version 4.19.65

 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1

 -   Update to version 4.19.52

 *   Tue May 07 2019 Ajay Kaher <akaher@vmware.com> 4.19.40-1

deleted file mode 100644

@@ -1,41 +0,0 @@

-From 9579fa77a71581a70d14a544cc58d0b00f700f05 Mon Sep 17 00:00:00 2001

-From: Gen Zhang <blackgod016574@gmail.com>

-Date: Fri, 24 May 2019 10:32:22 +0800

-Subject: [PATCH] drm/edid: Fix a missing-check bug in drm_load_edid_firmware()

-

-[ This patch is not yet upstream; however, it has been accepted into

-  the drm maintainer's queue. ]

-

-In drm_load_edid_firmware(), fwstr is allocated by kstrdup(). And fwstr

-is dereferenced in the following codes. However, memory allocation

-functions such as kstrdup() may fail and returns NULL. Dereferencing

-this null pointer may cause the kernel go wrong. Thus we should check

-this kstrdup() operation.

-Further, if kstrdup() returns NULL, we should return ERR_PTR(-ENOMEM) to

-the caller site.

-

-Signed-off-by: Gen Zhang <blackgod016574@gmail.com>

-Reviewed-by: Jani Nikula <jani.nikula@intel.com>

-Signed-off-by: Jani Nikula <jani.nikula@intel.com>

-Link: https://patchwork.freedesktop.org/patch/msgid/20190524023222.GA5302@zhanggen-UX430UQ

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

- drivers/gpu/drm/drm_edid_load.c | 2 ++

- 1 file changed, 2 insertions(+)

-

-diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c

-index a491509..a0e107a 100644

-+++ b/drivers/gpu/drm/drm_edid_load.c

-@@ -290,6 +290,8 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)

- 	 * the last one found one as a fallback.

- 	 */

- 	fwstr = kstrdup(edid_firmware, GFP_KERNEL);

-+	if (!fwstr)

-+		return ERR_PTR(-ENOMEM);

- 	edidstr = fwstr;

- 

- 	while ((edidname = strsep(&edidstr, ","))) {

-2.7.4

-

@@ -84,6 +84,7 @@ Subject: [PATCH 3/3] Added rap_plugin

  drivers/scsi/csiostor/csio_lnode.c            |  32 +-

  drivers/scsi/csiostor/csio_rnode.c            |  28 +-

  drivers/scsi/csiostor/csio_scsi.c             |  37 +-

+ fs/9p/vfs_addr.c                              |   3 +-

  fs/afs/file.c                                 |   8 +-

  fs/afs/internal.h                             |   2 +-

  fs/exofs/inode.c                              |   7 +-

@@ -119,7 +120,7 @@ Subject: [PATCH 3/3] Added rap_plugin

  scripts/gcc-plugins/rap_plugin/rap_plugin.c   | 534 +++++++++++++++++

  scripts/gcc-plugins/rap_plugin/sip.c          |  96 +++

  security/Kconfig                              |  18 +

- 115 files changed, 2511 insertions(+), 753 deletions(-)

+ 116 files changed, 2512 insertions(+), 755 deletions(-)

  create mode 100644 scripts/gcc-plugins/rap_plugin/Makefile

  create mode 100644 scripts/gcc-plugins/rap_plugin/rap.h

  create mode 100644 scripts/gcc-plugins/rap_plugin/rap_fptr_pass.c

@@ -3686,6 +3687,20 @@ index dab0d3f9bee1..770ffbf86037 100644

  	switch (evt) {

  	case CSIO_SCSIE_ABORT:

  	case CSIO_SCSIE_CLOSE:

+diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c

+index 197069303510..793772d114db 100644

+--- a/fs/9p/vfs_addr.c

+@@ -123,8 +123,7 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping,

+ 	if (ret == 0)

+ 		return ret;

+ 

+-	ret = read_cache_pages(mapping, pages, v9fs_fid_readpage,

+-			filp->private_data);

++	ret = read_cache_pages(mapping, pages, v9fs_vfs_readpage, filp);

+ 	p9_debug(P9_DEBUG_VFS, "  = %d\n", ret);

+ 	return ret;

+ }

 diff --git a/fs/afs/file.c b/fs/afs/file.c

 index 7d4f26198573..405f3c1034aa 100644

 --- a/fs/afs/file.c

@@ -2427,7 +2427,7 @@ CONFIG_SWPHY=y

 #

 CONFIG_AMD_PHY=m

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 CONFIG_AT803X_PHY=m

 CONFIG_BCM7XXX_PHY=m

 CONFIG_BCM87XX_PHY=m

@@ -2830,7 +2830,6 @@ CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_NVRAM=m

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 CONFIG_RAW_DRIVER=m

@@ -3460,6 +3459,7 @@ CONFIG_DRM_RADEON=m

 # AMD Library routines

 #

 CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y

 CONFIG_NOUVEAU_DEBUG=5

 CONFIG_NOUVEAU_DEBUG_DEFAULT=3

 # CONFIG_NOUVEAU_DEBUG_MMU is not set

@@ -2222,7 +2222,7 @@ CONFIG_PHYLIB=m

 #

 # CONFIG_AMD_PHY is not set

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 # CONFIG_AT803X_PHY is not set

 # CONFIG_BCM7XXX_PHY is not set

 # CONFIG_BCM87XX_PHY is not set

@@ -2468,7 +2468,6 @@ CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_NVRAM=m

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 CONFIG_RAW_DRIVER=m

@@ -2910,6 +2909,7 @@ CONFIG_DRM_RADEON=m

 # AMD Library routines

 #

 CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y

 CONFIG_NOUVEAU_DEBUG=5

 CONFIG_NOUVEAU_DEBUG_DEFAULT=3

 # CONFIG_NOUVEAU_DEBUG_MMU is not set

@@ -2068,7 +2068,6 @@ CONFIG_HW_RANDOM=m

 CONFIG_HW_RANDOM_RDRAND=m

 # CONFIG_HW_RANDOM_VIA is not set

 # CONFIG_NVRAM is not set

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 # CONFIG_RAW_DRIVER is not set

@@ -2342,7 +2342,7 @@ CONFIG_SWPHY=y

 #

 CONFIG_AMD_PHY=m

 # CONFIG_AQUANTIA_PHY is not set

-# CONFIG_ASIX_PHY is not set

+# CONFIG_AX88796B_PHY is not set

 CONFIG_AT803X_PHY=m

 CONFIG_BCM7XXX_PHY=m

 CONFIG_BCM87XX_PHY=m

@@ -2593,7 +2593,6 @@ CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_NVRAM=m

-# CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

 # CONFIG_MWAVE is not set

 CONFIG_RAW_DRIVER=m

@@ -3114,6 +3113,7 @@ CONFIG_DRM_RADEON=m

 # AMD Library routines

 #

 CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y

 CONFIG_NOUVEAU_DEBUG=5

 CONFIG_NOUVEAU_DEBUG_DEFAULT=3

 # CONFIG_NOUVEAU_DEBUG_MMU is not set

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-aws

-Version:        4.19.52

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

+Version:        4.19.65

+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=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+%define sha1 linux=598111781858ea0aaa328cfa0fec39264d2815d7

 Source1:	config-aws

 Source2:	initramfs.trigger

 Source3:        update_photon_cfg.postun

@@ -45,8 +45,6 @@ Patch34:        0001-consolemap-Fix-a-memory-leaking-bug-in-drivers-tty-v.patch

 Patch35:        0001-efi-x86-Add-missing-error-handling-to-old_memmap-1-1.patch

 # Fix for CVE-2019-12381

 Patch36:        0001-ip_sockglue-Fix-missing-check-bug-in-ip_ra_control.patch

-# Fix for CVE-2019-12382

-Patch37:        0001-drm-edid-Fix-a-missing-check-bug-in-drm_load_edid_fi.patch

 # Fix for CVE-2019-12378

 Patch38:        0001-ipv6_sockglue-Fix-a-missing-check-bug-in-ip6_ra_cont.patch

 # Fix for CVE-2019-12455

@@ -165,7 +163,6 @@ Kernel driver for oprofile, a statistical profiler for Linux systems

 %patch34 -p1

 %patch35 -p1

 %patch36 -p1

-%patch37 -p1

 %patch38 -p1

 %patch39 -p1

@@ -357,6 +354,9 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 %endif

 %changelog

+*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1

+-   Update to version 4.19.65

+-   Fix CVE-2019-1125 (SWAPGS)

 *   Tue Jul 30 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-3

 -   Fix postun script.

 *   Wed Jul 10 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-2

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-esx

-Version:        4.19.52

-Release:        4%{?dist}

+Version:        4.19.65

+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=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+%define sha1 linux=598111781858ea0aaa328cfa0fec39264d2815d7

 Source1:        config-esx

 Source2:        initramfs.trigger

 Source3:        update_photon_cfg.postun

@@ -51,8 +51,6 @@ Patch30:        0001-consolemap-Fix-a-memory-leaking-bug-in-drivers-tty-v.patch

 Patch31:        0001-efi-x86-Add-missing-error-handling-to-old_memmap-1-1.patch

 # Fix for CVE-2019-12381

 Patch32:        0001-ip_sockglue-Fix-missing-check-bug-in-ip_ra_control.patch

-# Fix for CVE-2019-12382

-Patch33:        0001-drm-edid-Fix-a-missing-check-bug-in-drm_load_edid_fi.patch

 # Fix for CVE-2019-12378

 Patch34:        0001-ipv6_sockglue-Fix-a-missing-check-bug-in-ip6_ra_cont.patch

 # Fix for CVE-2019-12455

@@ -122,7 +120,6 @@ The Linux package contains the Linux kernel doc files

 %patch30 -p1

 %patch31 -p1

 %patch32 -p1

-%patch33 -p1

 %patch34 -p1

 %patch35 -p1

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

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

 %changelog

+*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1

+-   Update to version 4.19.65

+-   Fix CVE-2019-1125 (SWAPGS)

 *   Tue Jul 30 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-4

 -   Fix postun script.

 *   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-3

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-secure

-Version:        4.19.52

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

+Version:        4.19.65

+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=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+%define sha1 linux=598111781858ea0aaa328cfa0fec39264d2815d7

 Source1:        config-secure

 Source2:        initramfs.trigger

 Source3:        update_photon_cfg.postun

@@ -49,8 +49,6 @@ Patch37:        0001-consolemap-Fix-a-memory-leaking-bug-in-drivers-tty-v.patch

 Patch38:        0001-efi-x86-Add-missing-error-handling-to-old_memmap-1-1.patch

 # Fix for CVE-2019-12381

 Patch39:        0001-ip_sockglue-Fix-missing-check-bug-in-ip_ra_control.patch

-# Fix for CVE-2019-12382

-Patch40:        0001-drm-edid-Fix-a-missing-check-bug-in-drm_load_edid_fi.patch

 # Fix for CVE-2019-12378

 Patch41:        0001-ipv6_sockglue-Fix-a-missing-check-bug-in-ip6_ra_cont.patch

 # Fix for CVE-2019-12455

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

 %patch37 -p1

 %patch38 -p1

 %patch39 -p1

-%patch40 -p1

 %patch41 -p1

 %patch42 -p1

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

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

 %changelog

+*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1

+-   Update to version 4.19.65

+-   Fix CVE-2019-1125 (SWAPGS)

 *   Tue Jul 30 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-3

 -   Fix postun script.

 *   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-2

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

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:        4.19.52

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

+Version:        4.19.65

+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=0fc8eeba8a8a710c95d71f140dfdc4bdff735248

+%define sha1 linux=598111781858ea0aaa328cfa0fec39264d2815d7

 Source1:	config

 Source2:	initramfs.trigger

 %define ena_version 1.6.0

@@ -54,8 +54,6 @@ Patch34:        0001-consolemap-Fix-a-memory-leaking-bug-in-drivers-tty-v.patch

 Patch35:        0001-efi-x86-Add-missing-error-handling-to-old_memmap-1-1.patch

 # Fix for CVE-2019-12381

 Patch36:        0001-ip_sockglue-Fix-missing-check-bug-in-ip_ra_control.patch

-# Fix for CVE-2019-12382

-Patch37:        0001-drm-edid-Fix-a-missing-check-bug-in-drm_load_edid_fi.patch

 # Fix for CVE-2019-12378

 Patch38:        0001-ipv6_sockglue-Fix-a-missing-check-bug-in-ip6_ra_cont.patch

 # Fix for CVE-2019-12455

@@ -209,7 +207,6 @@ Kernel Device Tree Blob files for NXP ls1012a FRWY board

 %patch34 -p1

 %patch35 -p1

 %patch36 -p1

-%patch37 -p1

 %patch38 -p1

 %patch39 -p1

@@ -475,6 +472,9 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 %endif

 %changelog

+*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1

+-   Update to version 4.19.65

+-   Fix CVE-2019-1125 (SWAPGS)

 *   Tue Jul 30 2019 Ajay Kaher <akaher@vmware.com> 4.19.52-7

 -   Added of_configfs patches to dynamic load Overlays.

 *   Thu Jul 25 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-6