diff --git a/Patchlist.changelog b/Patchlist.changelog index 8f5533a96..4c8097782 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/f750649d94f92a8b96722222410e9264507c7fd6 + f750649d94f92a8b96722222410e9264507c7fd6 lsm: update security_lock_kernel_down + "https://gitlab.com/cki-project/kernel-ark/-/commit"/e2354555abc8dcf010149c0d0931cf3b2c9efad4 e2354555abc8dcf010149c0d0931cf3b2c9efad4 arch/x86/kernel/setup.c: fixup rh_check_supported diff --git a/kernel.spec b/kernel.spec index 815e289a3..b1b875a16 100644 --- a/kernel.spec +++ b/kernel.spec @@ -3962,6 +3962,7 @@ fi\ # %changelog * Wed Mar 13 2024 Augusto Caringi [6.9.0-0.rc0.20240313gitb0546776ad3f.4] +- lsm: update security_lock_kernel_down (Scott Weaver) - Add new string kunit modules to mod-internal.list (Thorsten Leemhuis) * Wed Mar 13 2024 Fedora Kernel Team [6.9.0-0.rc0.b0546776ad3f.4] diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index ff197450c..79416b71e 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -3866,7 +3866,7 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index a07f43c58d65..e12482f1692f 100644 +index a07f43c58d65..89648841cbf4 100644 --- a/security/security.c +++ b/security/security.c @@ -5561,6 +5561,18 @@ int security_locked_down(enum lockdown_reason what) @@ -3881,7 +3881,7 @@ index a07f43c58d65..e12482f1692f 100644 + */ +int security_lock_kernel_down(const char *where, enum lockdown_reason level) +{ -+ return call_int_hook(lock_kernel_down, 0, where, level); ++ return call_int_hook(lock_kernel_down, where, level); +} +EXPORT_SYMBOL(security_lock_kernel_down); + diff --git a/sources b/sources index ab427fe75..573e1d178 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 SHA512 (linux-6.8-5292-gb0546776ad3f.tar.xz) = ce67912ebc23a7dc6344ba11c072825cecfec56de6d47c68e326cf2181b95313bd49f28e197a850d78d62f91a17576b963727aae111a6de294c8d893e64236ef -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = ef62446069955efe9aa1ffc80e60803e8ec08dde38cc4a6b7e3c670d74f105a664959f714ae0b1f310d743b113b8ff5ac638e8842b59477decaa7b1b2bf6371e -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 7edf1862617f4ce92e6aa4034d15be33f3a9db49357b20f3b651055afed42d9eca92e2233107d4a0c3003de15daf30894ad5cb1d7dbd04470fad1fd6fb161c31 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 4f8f5410c3bfb7a542c344801bbb0be7fa6512091fce4aecf2a348fa08cd45f334e19d25fe1521e52627236116f028a70dd3ad83d4e72d9b164e498b59e6193d +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 5ef598c174b49f9ae4b69d0dd93aeef3db1cbc5d21a45d224523b3b95f1e1e93aab6b26f73a11486f90941dd127e72a3445be9802e79496d9dc566e7a74f0b8d