diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-06 17:45:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-06 17:45:02 +0200 |
| commit | f74174ce806f67006fc43d0822e891966702d82c (patch) | |
| tree | f9a84a9572ea072114db111d94f27689672076e8 /0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch | |
| parent | 40b690d3b5b8bb7bb32ad27cd325c0cbb60d5352 (diff) | |
| parent | 358c00f77ff317634027eb4ac228be1df3632c44 (diff) | |
| download | kernel-f74174ce806f67006fc43d0822e891966702d82c.tar.gz kernel-f74174ce806f67006fc43d0822e891966702d82c.tar.xz kernel-f74174ce806f67006fc43d0822e891966702d82c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.1.vanilla.1.fc33kernel-5.8.0-0.rc4.1.vanilla.1.fc32kernel-5.8.0-0.rc4.1.vanilla.1.fc31
Diffstat (limited to '0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch')
| -rw-r--r-- | 0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch index 3b44f9801..9189832cf 100644 --- a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch +++ b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch @@ -17,7 +17,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com> 5 files changed, 20 insertions(+) diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 6791813cd439..501e14cff79c 100644 +index af998f93d256..3c33f00cd4d6 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -383,6 +383,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) @@ -82,10 +82,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index 0ce3e73edd42..8fe9a9911261 100644 +index 70a7ad357bc6..23e16e773bc2 100644 --- a/security/security.c +++ b/security/security.c -@@ -2501,6 +2501,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2516,6 +2516,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); |