diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-25 20:23:31 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-25 20:23:31 +0200 |
| commit | d48a756e71e269ecef24682ba38b6b49ed2a6abe (patch) | |
| tree | eedcffbdc006249cf78c978921353f2d48ea1eb7 /0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch | |
| parent | 0fef10ff99cd9135af6241b94fc9ca8a1aaba78e (diff) | |
| parent | a79d8affb70a95069c35a0ccf7085e230c22a98d (diff) | |
| download | kernel-5.7.0-0.rc7.1.vanilla.1.fc31.tar.gz kernel-5.7.0-0.rc7.1.vanilla.1.fc31.tar.xz kernel-5.7.0-0.rc7.1.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc7.1.vanilla.1.fc33kernel-5.7.0-0.rc7.1.vanilla.1.fc32kernel-5.7.0-0.rc7.1.vanilla.1.fc31kernel-5.7.0-0.rc7.1.vanilla.1.fc30
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 abce4dd0a..fc6b78ad0 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 5a952617a0eb..61cc3cdc4d25 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index 7fed24b9d57e..37fab5c5d974 100644 +index 51de970fbb1e..48d05f8067f2 100644 --- a/security/security.c +++ b/security/security.c -@@ -2456,6 +2456,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2468,6 +2468,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); |