diff options
Diffstat (limited to 'debian/patches/features/all')
2 files changed, 7 insertions, 42 deletions
diff --git a/debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch b/debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch deleted file mode 100644 index 4c4be6b22a..0000000000 --- a/debian/patches/features/all/driver-core-Emit-reason-for-pending-deferred-probe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> -Date: Wed, 22 Nov 2023 10:33:33 +0100 -Subject: driver core: Emit reason for pending deferred probe -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=7c41da586e9f45bf8842b4dca08681df8d586ebb - -Ending a boot log with - - platform 3f202000.mmc: deferred probe pending - -is already a nice hint about the problem. Sometimes there is a more -detailed error indicator available, add that to the output. - -Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> -Link: https://lore.kernel.org/r/20231122093332.274145-2-u.kleine-koenig@pengutronix.de -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/base/dd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/base/dd.c b/drivers/base/dd.c -index 0c3725c3eefa..85152537dbf1 100644 ---- a/drivers/base/dd.c -+++ b/drivers/base/dd.c -@@ -313,7 +313,7 @@ static void deferred_probe_timeout_work_func(struct work_struct *work) - - mutex_lock(&deferred_probe_mutex); - list_for_each_entry(p, &deferred_probe_pending_list, deferred_probe) -- dev_info(p->device, "deferred probe pending\n"); -+ dev_info(p->device, "deferred probe pending: %s", p->deferred_probe_reason ?: "(reason unknown)\n"); - mutex_unlock(&deferred_probe_mutex); - - fw_devlink_probing_done(); --- -2.43.0 - 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 3a10822b3b..d224208d4e 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,7 +26,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -902,6 +902,8 @@ void __init setup_arch(char **cmdline_p) +@@ -900,6 +900,8 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -67,17 +67,17 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> default: --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -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); +@@ -496,6 +496,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); +int lock_kernel_down(const char *where, enum lockdown_reason level); #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1404,6 +1405,11 @@ static inline int security_locked_down(e +@@ -1439,6 +1440,11 @@ static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, { - return 0; + return -EOPNOTSUPP; } +static inline int +lock_kernel_down(const char *where, enum lockdown_reason level) @@ -110,7 +110,7 @@ Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> + triggered in integrity mode if EFI Secure Boot is set. --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c -@@ -23,7 +23,7 @@ static const enum lockdown_reason lockdo +@@ -24,7 +24,7 @@ static const enum lockdown_reason lockdo /* * Put the kernel into lock-down mode. */ |