diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
| commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
| tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch | |
| parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
| parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
| download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.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 | 4 |
1 files changed, 2 insertions, 2 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 b3601e549..85ec742e6 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 @@ -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 545243fae4a6..3abc2e580c4e 100644 +index e0290b7e6a08..124ecb15a291 100644 --- a/security/security.c +++ b/security/security.c -@@ -2478,6 +2478,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2479,6 +2479,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); |