rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Fix up merge error

Browse Source 
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-01-17 10:40:46 -06:00
parent 47976a2283
commit 0929021fd8
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patch-6.8-redhat.patch
View File

@ -56,7 +56,7 @@
include/linux/random.h | 10 + include/linux/random.h | 10 +
include/linux/rh_kabi.h | 541 +++++++++++++++++++++ include/linux/rh_kabi.h | 541 +++++++++++++++++++++
include/linux/rmi.h | 1 + include/linux/rmi.h | 1 +
include/linux/security.h | 4 + include/linux/security.h | 5 +
init/main.c | 3 + init/main.c | 3 +
kernel/Makefile | 1 + kernel/Makefile | 1 +
kernel/bpf/syscall.c | 23 + kernel/bpf/syscall.c | 23 +
@ -71,7 +71,7 @@
security/lockdown/Kconfig | 13 + security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 12 + security/security.c | 12 +
73 files changed, 2114 insertions(+), 207 deletions(-) 73 files changed, 2115 insertions(+), 207 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 6ee0f9a5da70..daf2f964e431 100644 index 6ee0f9a5da70..daf2f964e431 100644
@ -3017,7 +3017,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport); int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h diff --git a/include/linux/security.h b/include/linux/security.h
index d0eb20f90b26..81be45281d2b 100644 index d0eb20f90b26..a99c045730e9 100644
--- a/include/linux/security.h --- a/include/linux/security.h
+++ b/include/linux/security.h +++ b/include/linux/security.h
@@ -494,6 +494,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -494,6 +494,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
@ -3028,13 +3028,14 @@ index d0eb20f90b26..81be45281d2b 100644
int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, size_t *uctx_len, int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, size_t *uctx_len,
void *val, size_t val_len, u64 id, u64 flags); void *val, size_t val_len, u64 id, u64 flags);
#else /* CONFIG_SECURITY */ #else /* CONFIG_SECURITY */
@@ -1433,6 +1434,9 @@ static inline int security_locked_down(enum lockdown_reason what) @@ -1433,6 +1434,10 @@ static inline int security_locked_down(enum lockdown_reason what)
{ {
return 0; return 0;
} }
+static inline int security_lock_kernel_down(const char *where, enum lockdown_reason level) +static inline int security_lock_kernel_down(const char *where, enum lockdown_reason level)
+{ +{
+ return 0; + return 0;
+}
static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx,
size_t *uctx_len, void *val, size_t val_len, size_t *uctx_len, void *val, size_t val_len,
u64 id, u64 flags) u64 id, u64 flags)