diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:01:03 +0000 |
| commit | 62db400e83102695233497884d16a19c7e34fcd4 (patch) | |
| tree | 62d1c1a2105118357e772c53c56478baf87bf946 /debian/patches/features/all | |
| parent | Merging upstream version 6.9.2. (diff) | |
| download | linux-62db400e83102695233497884d16a19c7e34fcd4.tar.xz linux-62db400e83102695233497884d16a19c7e34fcd4.zip | |
Merging debian version 6.9.2-1~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/features/all')
| -rw-r--r-- | debian/patches/features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch | 6 |
1 files changed, 3 insertions, 3 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 d224208d4e..f836c8b83d 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 @@ -35,7 +35,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> reserve_ibft_region(); x86_init.resources.dmi_setup(); -@@ -1063,8 +1065,6 @@ void __init setup_arch(char **cmdline_p) +@@ -1061,8 +1063,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 -@@ -496,6 +496,7 @@ int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); +@@ -509,6 +509,7 @@ int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags); @@ -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) -@@ -1439,6 +1440,11 @@ static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, +@@ -1483,6 +1484,11 @@ static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, { return -EOPNOTSUPP; } |