diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-13 17:03:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-13 17:03:57 +0200 |
commit | 05866a6422ee051189153cfdf8a6baef65c3d109 (patch) | |
tree | 7334fada229f1eec8444143b02b7d5b6c633b2df /patch-5.14.0-redhat.patch | |
parent | 4827f436287d3ede25db162c8d2c6838ea7df1a9 (diff) | |
parent | 7a8626667d73f25469b8554da90870f46bc54423 (diff) | |
download | kernel-05866a6422ee051189153cfdf8a6baef65c3d109.tar.gz kernel-05866a6422ee051189153cfdf8a6baef65c3d109.tar.xz kernel-05866a6422ee051189153cfdf8a6baef65c3d109.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.14.0-redhat.patch')
-rw-r--r-- | patch-5.14.0-redhat.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch index 2f7f937d4..601772e82 100644 --- a/patch-5.14.0-redhat.patch +++ b/patch-5.14.0-redhat.patch @@ -2306,10 +2306,10 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 24eda04221e9..128837ea1fb2 100644 +index 5b7288521300..f966f591c91e 100644 --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -471,6 +471,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); +@@ -472,6 +472,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); 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); @@ -2317,7 +2317,7 @@ index 24eda04221e9..128837ea1fb2 100644 #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1347,6 +1348,10 @@ static inline int security_locked_down(enum lockdown_reason what) +@@ -1348,6 +1349,10 @@ static inline int security_locked_down(enum lockdown_reason what) { return 0; } @@ -2705,10 +2705,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index 09533cbb7221..d36675494753 100644 +index 9ffa9e9c5c55..36484cc9842d 100644 --- a/security/security.c +++ b/security/security.c -@@ -2598,6 +2598,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2599,6 +2599,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); |