folkslinux
/
VMware-Photon-OS
mirror of https://github.com/vmware/photon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernels: Update to 6.1.79 

Change-Id: I5e8af84932e03b0c2f3304591520a6c0949614ec
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/23346
Reviewed-by: Ajay Kaher <akaher@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/23856
Tested-by: Ajay Kaher <akaher@vmware.com>
This commit is contained in:
Vamsi Krishna Brahmajosyula 2024-02-26 00:35:52 -06:00 committed by Ajay Kaher
parent 3d9f53fa8f
commit 8b7b87c91d
13 changed files with 29 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPECS/linux-api-headers/linux-api-headers.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Summary: Linux API header files
Name: linux-api-headers
Version: 6.1.77
Version: 6.1.79
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/v6.x/linux-%{version}.tar.xz
%define sha512 linux=b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5
%define sha512 linux=a8d0940c683744c713403304de8970b55beda7cfd339c00f7888236982b68d6577ea9f11f700f0181b66771e3daca2c41dbedce201662d36e9372bda11e10c2e
BuildArch: noarch
%description
The Linux API Headers expose the kernel's API for use by Glibc.
@ -39,6 +39,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de
%{_includedir}/*
%changelog
* Mon Feb 26 2024 Vamsi Krishna Brahmajosyula <vamsi-krishna.brahmajosyula@broadcom.com> 6.1.79-1
- Update to version 6.1.79
* Tue Feb 06 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 6.1.77-1
- Update to version 6.1.77
* Mon Jan 22 2024 Ajay Kaher <ajay.kaher@broadcom.com> 6.1.75-1

38
SPECS/linux/CVE/0001-vhost_use_kzalloc_instead_of_kmalloc.patch
View File

@ -1,38 +0,0 @@
From 4d8df0f5f79f747d75a7d356d9b9ea40a4e4c8a9 Mon Sep 17 00:00:00 2001
From: Prathu Baronia <prathubaronia2011@gmail.com>
Date: Mon, 22 May 2023 14:20:19 +0530
Subject: [PATCH] vhost: use kzalloc() instead of kmalloc() followed by
memset()
commit 4d8df0f5f79f747d75a7d356d9b9ea40a4e4c8a9 upstream
Use kzalloc() to allocate new zeroed out msg node instead of
memsetting a node allocated with kmalloc().
Signed-off-by: Prathu Baronia <prathubaronia2011@gmail.com>
Message-Id: <20230522085019.42914-1-prathubaronia2011@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---
drivers/vhost/vhost.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 07427302084955..ecb3b397bb3888 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -2563,12 +2563,11 @@ EXPORT_SYMBOL_GPL(vhost_disable_notify);
/* Create a new message. */
struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type)
{
- struct vhost_msg_node *node = kmalloc(sizeof *node, GFP_KERNEL);
+ /* Make sure all padding within the structure is initialized. */
+ struct vhost_msg_node *node = kzalloc(sizeof(*node), GFP_KERNEL);
if (!node)
return NULL;
- /* Make sure all padding within the structure is initialized. */
- memset(&node->msg, 0, sizeof node->msg);
node->vq = vq;
node->msg.type = type;
return node;

1
SPECS/linux/config-esx_aarch64
View File

@ -14,6 +14,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=0

1
SPECS/linux/config-esx_x86_64
View File

@ -14,6 +14,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=0

1
SPECS/linux/config-rt
View File

@ -14,6 +14,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=124

1
SPECS/linux/config-secure
View File

@ -14,6 +14,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=0

1
SPECS/linux/config_aarch64
View File

@ -14,6 +14,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=124

1
SPECS/linux/config_x86_64
View File

@ -14,6 +14,7 @@ CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=124

8
SPECS/linux/linux-esx.spec
View File

@ -20,7 +20,7 @@
Summary: Kernel
Name: linux-esx
Version: 6.1.77
Version: 6.1.79
Release: 1%{?dist}
License: GPLv2
URL: http://www.kernel.org
@ -32,7 +32,7 @@ Distribution: Photon
%define _modulesdir /lib/modules/%{uname_r}
Source0: http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz
%define sha512 linux=b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5
%define sha512 linux=a8d0940c683744c713403304de8970b55beda7cfd339c00f7888236982b68d6577ea9f11f700f0181b66771e3daca2c41dbedce201662d36e9372bda11e10c2e
Source1: config-esx_%{_arch}
Source2: initramfs.trigger
@ -181,8 +181,6 @@ Patch105: RDMA-core-Refactor-rdma_bind_addr.patch
Patch106: RDMA-core-Update-CMA-destination-address-on-rdma_resolve_addr.patch
# Fix CVE-2023-39191
%include %{SOURCE42}
# Fix CVE-2024-0340
Patch107: 0001-vhost_use_kzalloc_instead_of_kmalloc.patch
# aarch64 [200..219]
%ifarch aarch64
@ -460,6 +458,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
%{_usrsrc}/linux-headers-%{uname_r}
%changelog
* Mon Apr 29 2024 Vamsi Krishna Brahmajosyula <vamsi-krishna.brahmajosyula@broadcom.com> 6.1.79-1
- Update to version 6.1.79
* Mon Apr 29 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 6.1.77-1
- Update to version 6.1.77
* Mon Apr 29 2024 Ajay Kaher <ajay.kaher@broadcom.com> 6.1.75-1

8
SPECS/linux/linux-rt.spec
View File

@ -13,7 +13,7 @@
Summary: Kernel
Name: linux-rt
Version: 6.1.77
Version: 6.1.79
Release: 1%{?dist}
License: GPLv2
URL: http://www.kernel.org
@ -27,7 +27,7 @@ Distribution: Photon
%define _modulesdir /lib/modules/%{uname_r}
Source0: http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz
%define sha512 linux=b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5
%define sha512 linux=a8d0940c683744c713403304de8970b55beda7cfd339c00f7888236982b68d6577ea9f11f700f0181b66771e3daca2c41dbedce201662d36e9372bda11e10c2e
%ifarch x86_64
Source1: config-rt
@ -152,8 +152,6 @@ Patch105: RDMA-core-Refactor-rdma_bind_addr.patch
Patch106: RDMA-core-Update-CMA-destination-address-on-rdma_resolve_addr.patch
# Fix CVE-2023-39191
%include %{SOURCE42}
# Fix CVE-2024-0340
Patch107: 0001-vhost_use_kzalloc_instead_of_kmalloc.patch
# Real-Time kernel (PREEMPT_RT patches)
# Source: http://cdn.kernel.org/pub/linux/kernel/projects/rt/6.1/
@ -476,6 +474,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
%{_libdir}/libstalld_bpf.so
%changelog
* Mon Apr 29 2024 Vamsi Krishna Brahmajosyula <vamsi-krishna.brahmajosyula@broadcom.com> 6.1.79-1
- Update to version 6.1.79
* Mon Apr 29 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 6.1.77-1
- Update to version 6.1.77, rt24
* Mon Apr 29 2024 Ajay Kaher <ajay.kaher@broadcom.com> 6.1.75-1

8
SPECS/linux/linux-secure.spec
View File

@ -13,7 +13,7 @@
Summary: Kernel
Name: linux-secure
Version: 6.1.77
Version: 6.1.79
Release: 1%{?kat_build:.kat}%{?dist}
License: GPLv2
URL: http://www.kernel.org
@ -25,7 +25,7 @@ Distribution: Photon
%define _modulesdir /lib/modules/%{uname_r}
Source0: http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz
%define sha512 linux=b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5
%define sha512 linux=a8d0940c683744c713403304de8970b55beda7cfd339c00f7888236982b68d6577ea9f11f700f0181b66771e3daca2c41dbedce201662d36e9372bda11e10c2e
Source1: config-secure
Source2: initramfs.trigger
# contains pre, postun, filetriggerun tasks
@ -157,8 +157,6 @@ Patch105: RDMA-core-Refactor-rdma_bind_addr.patch
Patch106: RDMA-core-Update-CMA-destination-address-on-rdma_resolve_addr.patch
# Fix CVE-2023-39191
%include %{SOURCE40}
# Fix CVE-2024-0340
Patch107: 0001-vhost_use_kzalloc_instead_of_kmalloc.patch
# Crypto:
# Patch to invoke crypto self-tests and add missing test vectors to testmgr
@ -487,6 +485,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
%endif
%changelog
* Mon Apr 29 2024 Vamsi Krishna Brahmajosyula <vamsi-krishna.brahmajosyula@broadcom.com> 6.1.79-1
- Update to version 6.1.79
* Mon Apr 29 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 6.1.77-1
- Update to version 6.1.77
* Mon Apr 29 2024 Ajay Kaher <ajay.kaher@broadcom.com> 6.1.75-1

8
SPECS/linux/linux.spec
View File

@ -29,7 +29,7 @@
Summary: Kernel
Name: linux
Version: 6.1.77
Version: 6.1.79
Release: 1%{?acvp_build:.acvp}%{?kat_build:.kat}%{?dist}
License: GPLv2
URL: http://www.kernel.org/
@ -41,7 +41,7 @@ Distribution: Photon
%define _modulesdir /lib/modules/%{uname_r}
Source0: http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{version}.tar.xz
%define sha512 linux=b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5
%define sha512 linux=a8d0940c683744c713403304de8970b55beda7cfd339c00f7888236982b68d6577ea9f11f700f0181b66771e3daca2c41dbedce201662d36e9372bda11e10c2e
Source1: config_%{_arch}
Source2: initramfs.trigger
@ -188,8 +188,6 @@ Patch105: RDMA-core-Refactor-rdma_bind_addr.patch
Patch106: RDMA-core-Update-CMA-destination-address-on-rdma_resolve_addr.patch
# Fix CVE-2023-39191
%include %{SOURCE50}
# Fix CVE-2024-0340
Patch107: 0001-vhost_use_kzalloc_instead_of_kmalloc.patch
%ifarch aarch64
# aarch specific patches [200..219]
@ -846,6 +844,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
%endif
%changelog
* Mon Apr 29 2024 Vamsi Krishna Brahmajosyula <vamsi-krishna.brahmajosyula@broadcom.com> 6.1.79-1
- Update to version 6.1.79
* Mon Apr 29 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 6.1.77-1
- Update to version 6.1.77
* Mon Apr 29 2024 Ajay Kaher <ajay.kaher@broadcom.com> 6.1.75-1

6
SPECS/linux/rt/6.1.75-rt24/0057-sched-avoid-false-lockdep-splat-in-put_task_struct.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Clark Williams <clark.williams@gmail.com>
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h
index 7291fb6399d2..de7ebd2bf3ba 100644
index aaa25ed1a..a51c36397 100644
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -141,8 +141,12 @@ static inline void put_task_struct(struct task_struct *t)
@ -45,7 +45,7 @@ index 7291fb6399d2..de7ebd2bf3ba 100644
+ }
}
static inline void put_task_struct_many(struct task_struct *t, int nr)
DEFINE_FREE(put_task, struct task_struct *, if (_T) put_task_struct(_T))
--
2.43.0
2.43.2