diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 18:48:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 18:48:17 +0000 |
| commit | c066c7f39961a7ad5c087c250a868bbfb48c0876 (patch) | |
| tree | 638255e8fca772f401a1bd09ea8cc48a47582283 /debian/patches/features | |
| parent | Merging upstream version 6.7.12. (diff) | |
| download | linux-c066c7f39961a7ad5c087c250a868bbfb48c0876.tar.xz linux-c066c7f39961a7ad5c087c250a868bbfb48c0876.zip | |
Merging debian version 6.7.12-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/features')
| -rw-r--r-- | debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch b/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch index 3d8bdf0664..3a10822b3b 100644 --- a/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch +++ b/debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch @@ -26,16 +26,16 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1031,6 +1031,8 @@ void __init setup_arch(char **cmdline_p) +@@ -902,6 +902,8 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); + efi_set_secure_boot(boot_params.secure_boot); + reserve_ibft_region(); - dmi_setup(); + x86_init.resources.dmi_setup(); -@@ -1192,8 +1194,6 @@ void __init setup_arch(char **cmdline_p) +@@ -1063,8 +1065,6 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -67,7 +67,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> default: --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -482,6 +482,7 @@ int security_inode_notifysecctx(struct i +@@ -486,6 +486,7 @@ int security_inode_notifysecctx(struct i int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); @@ -75,7 +75,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1388,6 +1389,11 @@ static inline int security_locked_down(e +@@ -1404,6 +1405,11 @@ static inline int security_locked_down(e { return 0; } |