On Fri, 9 Apr 2021 at 05:03, Jason A. Donenfeld <ja...@zx2c4.com> wrote:
>
> On Fri, Apr 09, 2021 at 10:49:07AM +0800, Hangbin Liu wrote:
> > On Thu, Apr 08, 2021 at 08:44:35PM -0600, Jason A. Donenfeld wrote:
> > > Since it's just a normal module library, you can simply do this in the
> > > module_init function, rather than deep within registration
> > > abstractions.
> >
> > I did a try but looks it's not that simple. Not sure if it's because
> > wireguard
> > calls the library directly. Need to check more...
>
> Something like the below should work...
>
The below only works if all the code is modular. initcall return
values are ignored for builtin code, and so the library functions will
happily work regardless of fips_enabled, and there is generally no
guarantee that no library calls can be made before the initcall() is
invoked.
For ordinary crypto API client code, the algorithm in question may be
an a priori unknown, and so the only sensible place to put this check
is where the algorithms are registered or instantiated.
For code such as WireGuard that is hardwired to use a single set of
(forbidden! :-)) algorithms via library calls, the simplest way to do
this securely is to disable the whole thing, even though I agree it is
not the most elegant solution.
If we go with Jason's approach, we would need to mandate each of these
drivers can only be built as a module if the kernel is built with
FIPS-200 support. This is rather trivial by itself, i.e.,
depends on m || !CRYPTO_FIPS
but I am a bit concerned that the rather intricate kconfig
dependencies between the generic and arch-optimized versions of those
drivers get complicated even further.
--
Ard.
> diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c
> index a408f4bcfd62..47212f9421c1 100644
> --- a/arch/arm/crypto/chacha-glue.c
> +++ b/arch/arm/crypto/chacha-glue.c
> @@ -14,6 +14,7 @@
> #include <linux/jump_label.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> #include <asm/cputype.h>
> #include <asm/hwcap.h>
> @@ -297,6 +298,9 @@ static int __init chacha_simd_mod_init(void)
> {
> int err = 0;
>
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER)) {
> err = crypto_register_skciphers(arm_algs,
> ARRAY_SIZE(arm_algs));
> if (err)
> diff --git a/arch/arm/crypto/curve25519-glue.c
> b/arch/arm/crypto/curve25519-glue.c
> index 31eb75b6002f..d03f810fdaf3 100644
> --- a/arch/arm/crypto/curve25519-glue.c
> +++ b/arch/arm/crypto/curve25519-glue.c
> @@ -14,6 +14,7 @@
> #include <crypto/internal/simd.h>
> #include <linux/types.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
> #include <linux/init.h>
> #include <linux/jump_label.h>
> #include <linux/scatterlist.h>
> @@ -114,6 +115,9 @@ static struct kpp_alg curve25519_alg = {
>
> static int __init mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (elf_hwcap & HWCAP_NEON) {
> static_branch_enable(&have_neon);
> return IS_REACHABLE(CONFIG_CRYPTO_KPP) ?
> diff --git a/arch/arm/crypto/poly1305-glue.c b/arch/arm/crypto/poly1305-glue.c
> index 3023c1acfa19..30d6c6de7a27 100644
> --- a/arch/arm/crypto/poly1305-glue.c
> +++ b/arch/arm/crypto/poly1305-glue.c
> @@ -17,6 +17,7 @@
> #include <linux/crypto.h>
> #include <linux/jump_label.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> void poly1305_init_arm(void *state, const u8 *key);
> void poly1305_blocks_arm(void *state, const u8 *src, u32 len, u32 hibit);
> @@ -240,6 +241,9 @@ static struct shash_alg arm_poly1305_algs[] = {{
>
> static int __init arm_poly1305_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) &&
> (elf_hwcap & HWCAP_NEON))
> static_branch_enable(&have_neon);
> diff --git a/arch/arm64/crypto/chacha-neon-glue.c
> b/arch/arm64/crypto/chacha-neon-glue.c
> index 1d9824c4ae43..1696993326b5 100644
> --- a/arch/arm64/crypto/chacha-neon-glue.c
> +++ b/arch/arm64/crypto/chacha-neon-glue.c
> @@ -26,6 +26,7 @@
> #include <linux/jump_label.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> #include <asm/hwcap.h>
> #include <asm/neon.h>
> @@ -214,6 +215,9 @@ static struct skcipher_alg algs[] = {
>
> static int __init chacha_simd_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!cpu_have_named_feature(ASIMD))
> return 0;
>
> diff --git a/arch/arm64/crypto/poly1305-glue.c
> b/arch/arm64/crypto/poly1305-glue.c
> index f33ada70c4ed..ac257a52be4d 100644
> --- a/arch/arm64/crypto/poly1305-glue.c
> +++ b/arch/arm64/crypto/poly1305-glue.c
> @@ -17,6 +17,7 @@
> #include <linux/crypto.h>
> #include <linux/jump_label.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> asmlinkage void poly1305_init_arm64(void *state, const u8 *key);
> asmlinkage void poly1305_blocks(void *state, const u8 *src, u32 len, u32
> hibit);
> @@ -208,6 +209,9 @@ static struct shash_alg neon_poly1305_alg = {
>
> static int __init neon_poly1305_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!cpu_have_named_feature(ASIMD))
> return 0;
>
> diff --git a/arch/mips/crypto/chacha-glue.c b/arch/mips/crypto/chacha-glue.c
> index 90896029d0cd..31f8294f2a31 100644
> --- a/arch/mips/crypto/chacha-glue.c
> +++ b/arch/mips/crypto/chacha-glue.c
> @@ -12,6 +12,7 @@
> #include <crypto/internal/skcipher.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> asmlinkage void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src,
> unsigned int bytes, int nrounds);
> @@ -128,6 +129,9 @@ static struct skcipher_alg algs[] = {
>
> static int __init chacha_simd_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> return IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER) ?
> crypto_register_skciphers(algs, ARRAY_SIZE(algs)) : 0;
> }
> diff --git a/arch/mips/crypto/poly1305-glue.c
> b/arch/mips/crypto/poly1305-glue.c
> index fc881b46d911..f5edec10cef8 100644
> --- a/arch/mips/crypto/poly1305-glue.c
> +++ b/arch/mips/crypto/poly1305-glue.c
> @@ -12,6 +12,7 @@
> #include <linux/cpufeature.h>
> #include <linux/crypto.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> asmlinkage void poly1305_init_mips(void *state, const u8 *key);
> asmlinkage void poly1305_blocks_mips(void *state, const u8 *src, u32 len,
> u32 hibit);
> @@ -173,6 +174,9 @@ static struct shash_alg mips_poly1305_alg = {
>
> static int __init mips_poly1305_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> return IS_REACHABLE(CONFIG_CRYPTO_HASH) ?
> crypto_register_shash(&mips_poly1305_alg) : 0;
> }
> diff --git a/arch/x86/crypto/blake2s-glue.c b/arch/x86/crypto/blake2s-glue.c
> index 94ac5bdd9f6f..968762fcc8b2 100644
> --- a/arch/x86/crypto/blake2s-glue.c
> +++ b/arch/x86/crypto/blake2s-glue.c
> @@ -11,6 +11,7 @@
> #include <linux/jump_label.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> #include <asm/cpufeature.h>
> #include <asm/fpu/api.h>
> @@ -194,6 +195,9 @@ static struct shash_alg blake2s_algs[] = {{
>
> static int __init blake2s_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!boot_cpu_has(X86_FEATURE_SSSE3))
> return 0;
>
> diff --git a/arch/x86/crypto/chacha_glue.c b/arch/x86/crypto/chacha_glue.c
> index 4c4dc64398cb..15e6cd084598 100644
> --- a/arch/x86/crypto/chacha_glue.c
> +++ b/arch/x86/crypto/chacha_glue.c
> @@ -12,6 +12,7 @@
> #include <crypto/internal/skcipher.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
> #include <asm/simd.h>
>
> asmlinkage void chacha_block_xor_ssse3(u32 *state, u8 *dst, const u8 *src,
> @@ -278,6 +279,9 @@ static struct skcipher_alg algs[] = {
>
> static int __init chacha_simd_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!boot_cpu_has(X86_FEATURE_SSSE3))
> return 0;
>
> diff --git a/arch/x86/crypto/curve25519-x86_64.c
> b/arch/x86/crypto/curve25519-x86_64.c
> index a9edb6f8a0ba..b840c7e49aa1 100644
> --- a/arch/x86/crypto/curve25519-x86_64.c
> +++ b/arch/x86/crypto/curve25519-x86_64.c
> @@ -11,6 +11,7 @@
> #include <linux/jump_label.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> #include <asm/cpufeature.h>
> #include <asm/processor.h>
> @@ -1488,6 +1489,9 @@ static struct kpp_alg curve25519_alg = {
>
> static int __init curve25519_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (boot_cpu_has(X86_FEATURE_BMI2) && boot_cpu_has(X86_FEATURE_ADX))
> static_branch_enable(&curve25519_use_bmi2_adx);
> else
> diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c
> index b69e362730d0..eb1940c74c7b 100644
> --- a/arch/x86/crypto/poly1305_glue.c
> +++ b/arch/x86/crypto/poly1305_glue.c
> @@ -11,6 +11,7 @@
> #include <linux/jump_label.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
> #include <asm/intel-family.h>
> #include <asm/simd.h>
>
> @@ -258,6 +259,9 @@ static struct shash_alg alg = {
>
> static int __init poly1305_simd_mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (IS_ENABLED(CONFIG_AS_AVX) && boot_cpu_has(X86_FEATURE_AVX) &&
> cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL))
> static_branch_enable(&poly1305_use_avx);
> diff --git a/lib/crypto/blake2s.c b/lib/crypto/blake2s.c
> index 41025a30c524..8d244eeb277e 100644
> --- a/lib/crypto/blake2s.c
> +++ b/lib/crypto/blake2s.c
> @@ -15,6 +15,7 @@
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/bug.h>
> +#include <linux/fips.h>
> #include <asm/unaligned.h>
>
> bool blake2s_selftest(void);
> @@ -109,6 +110,9 @@ EXPORT_SYMBOL(blake2s256_hmac);
>
> static int __init mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) &&
> WARN_ON(!blake2s_selftest()))
> return -ENODEV;
> diff --git a/lib/crypto/chacha.c b/lib/crypto/chacha.c
> index 65ead6b0c7e0..4f0087717faf 100644
> --- a/lib/crypto/chacha.c
> +++ b/lib/crypto/chacha.c
> @@ -11,6 +11,9 @@
> #include <linux/bitops.h>
> #include <linux/string.h>
> #include <linux/cryptohash.h>
> +#include <linux/fips.h>
> +#include <linux/errno.h>
> +#include <linux/module.h>
> #include <asm/unaligned.h>
> #include <crypto/chacha.h>
>
> @@ -113,3 +116,12 @@ void hchacha_block_generic(const u32 *state, u32
> *stream, int nrounds)
> memcpy(&stream[4], &x[12], 16);
> }
> EXPORT_SYMBOL(hchacha_block_generic);
> +
> +static int __init mod_init(void)
> +{
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> + return 0;
> +}
> +
> +module_init(mod_init);
> diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c
> index 1fec56e5dd51..d19278c5813d 100644
> --- a/lib/crypto/chacha20poly1305.c
> +++ b/lib/crypto/chacha20poly1305.c
> @@ -18,6 +18,7 @@
> #include <linux/init.h>
> #include <linux/mm.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
>
> #define CHACHA_KEY_WORDS (CHACHA_KEY_SIZE / sizeof(u32))
>
> @@ -358,6 +359,9 @@ EXPORT_SYMBOL(chacha20poly1305_decrypt_sg_inplace);
>
> static int __init mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) &&
> WARN_ON(!chacha20poly1305_selftest()))
> return -ENODEV;
> diff --git a/lib/crypto/curve25519.c b/lib/crypto/curve25519.c
> index 288a62cd29b2..f759d49b0b57 100644
> --- a/lib/crypto/curve25519.c
> +++ b/lib/crypto/curve25519.c
> @@ -12,11 +12,15 @@
> #include <crypto/curve25519.h>
> #include <linux/module.h>
> #include <linux/init.h>
> +#include <linux/fips.h>
>
> bool curve25519_selftest(void);
>
> static int __init mod_init(void)
> {
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> +
> if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) &&
> WARN_ON(!curve25519_selftest()))
> return -ENODEV;
> diff --git a/lib/crypto/poly1305.c b/lib/crypto/poly1305.c
> index 9d2d14df0fee..ae4255957d31 100644
> --- a/lib/crypto/poly1305.c
> +++ b/lib/crypto/poly1305.c
> @@ -10,6 +10,7 @@
> #include <crypto/internal/poly1305.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/fips.h>
> #include <asm/unaligned.h>
>
> void poly1305_init_generic(struct poly1305_desc_ctx *desc, const u8 *key)
> @@ -73,5 +74,14 @@ void poly1305_final_generic(struct poly1305_desc_ctx
> *desc, u8 *dst)
> }
> EXPORT_SYMBOL_GPL(poly1305_final_generic);
>
> +static int __init mod_init(void)
> +{
> + if (fips_enabled)
> + return -EOPNOTSUPP;
> + return 0;
> +}
> +
> +module_init(mod_init);
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Martin Willi <mar...@strongswan.org>");
>
>
