diff options
Diffstat (limited to 'patch-6.0-redhat.patch')
| -rw-r--r-- | patch-6.0-redhat.patch | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index 092b2da60..d2091440f 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -29,6 +29,7 @@ drivers/pci/pcie/ptm.c | 300 ++++++++++++--------- drivers/pci/quirks.c | 24 ++ drivers/usb/core/hub.c | 7 + + fs/overlayfs/file.c | 1 + include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -45,10 +46,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 47 files changed, 767 insertions(+), 365 deletions(-) + 48 files changed, 768 insertions(+), 365 deletions(-) diff --git a/Makefile b/Makefile -index a3c02b45fb57..97c8cb2941db 100644 +index 0c7ae314ad3d..70073286d29f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1786,6 +1787,18 @@ index bbab424b0d55..ed86042fb57b 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c +index daff601b5c41..6268eccfa69d 100644 +--- a/fs/overlayfs/file.c ++++ b/fs/overlayfs/file.c +@@ -96,6 +96,7 @@ static int ovl_change_flags(struct file *file, unsigned int flags) + + spin_lock(&file->f_lock); + file->f_flags = (file->f_flags & ~OVL_SETFL_MASK) | flags; ++ file->f_iocb_flags = iocb_flags(file); + spin_unlock(&file->f_lock); + + return 0; diff --git a/include/linux/efi.h b/include/linux/efi.h index f87b2f5db9f8..0b156c2a4ab3 100644 --- a/include/linux/efi.h @@ -2160,30 +2173,3 @@ index 4b95de24bc8d..10047790e96e 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -From 90c4bd0059367922f88768784bfb7c5ec1bc846c Mon Sep 17 00:00:00 2001 -From: "Justin M. Forbes" <jforbes@fedoraproject.org> -Date: Thu, 3 Nov 2022 11:34:03 -0500 -Subject: [PATCH] Revert "disable enum64 BTF in fedora rawhide" - -This option is not supported by older pahole versions. - -This reverts commit 7ab8e0d8b46b7f768e37f8ff39ccae2ecc897396. ---- - scripts/pahole-flags.sh | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh -index 81c8e082ec57..0d99ef17e4a5 100755 ---- a/scripts/pahole-flags.sh -+++ b/scripts/pahole-flags.sh -@@ -20,7 +20,4 @@ if [ "${pahole_ver}" -ge "122" ]; then - extra_paholeopt="${extra_paholeopt} -j" - fi - --# temporary workaround to disable enum64 --extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" -- - echo ${extra_paholeopt} --- -2.37.3 - |