kernel-6.0.15-300

* Wed Dec 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.15-0]
- ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags (Al Viro)
- Linux v6.0.15
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-12-21 12:03:48 -06:00
commit 0e79db3c79
No known key found for this signature in database
GPG key ID: B8FA7924A4B1C140
4 changed files with 28 additions and 8 deletions

View file

@ -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