]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
rust: cfi: fix `patchable-function-entry` starting version
authorMiguel Ojeda <ojeda@kernel.org>
Wed, 25 Sep 2024 14:19:44 +0000 (16:19 +0200)
committerMiguel Ojeda <ojeda@kernel.org>
Thu, 26 Sep 2024 19:27:27 +0000 (21:27 +0200)
The `-Zpatchable-function-entry` flag is available since Rust
1.81.0, not Rust 1.80.0, i.e. commit ac7595fdb1ee ("Support for -Z
patchable-function-entry") in upstream Rust.

Fixes: ca627e636551 ("rust: cfi: add support for CFI_CLANG with Rust")
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Fiona Behrens <me@kloenk.dev>
Link: https://lore.kernel.org/r/20240925141944.277936-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
init/Kconfig

index fbd0cb06a50a5f178e4a206e57011dc34698b458..fa734a14458911223cb490389c3766c1268a6e30 100644 (file)
@@ -1948,7 +1948,7 @@ config RUST
        depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
        depends on !CFI_CLANG || RUSTC_VERSION >= 107900 && $(cc-option,-fsanitize=kcfi -fsanitize-cfi-icall-experimental-normalize-integers)
        select CFI_ICALL_NORMALIZE_INTEGERS if CFI_CLANG
-       depends on !CALL_PADDING || RUSTC_VERSION >= 108000
+       depends on !CALL_PADDING || RUSTC_VERSION >= 108100
        depends on !KASAN_SW_TAGS
        help
          Enables Rust support in the kernel.