Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4943ba16 authored by Kees Cook's avatar Kees Cook Committed by Herbert Xu
Browse files

crypto: include crypto- module prefix in template 



This adds the module loading prefix "crypto-" to the template lookup
as well.

For example, attempting to load 'vfat(blowfish)' via AF_ALG now correctly
includes the "crypto-" prefix at every level, correctly rejecting "vfat":

	net-pf-38
	algif-hash
	crypto-vfat(blowfish)
	crypto-vfat(blowfish)-all
	crypto-vfat

Reported-by: default avatarMathias Krause <minipli@googlemail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarMathias Krause <minipli@googlemail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 476c7fe2

arch/x86/crypto/fpu.c

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/crypto.h>

#include <asm/i387.h>



struct crypto_fpu_ctx {
@@ -159,3 +160,5 @@ void __exit crypto_fpu_exit(void) 
{

	crypto_unregister_template(&crypto_fpu_tmpl);

}



MODULE_ALIAS_CRYPTO("fpu");

crypto/algapi.c

+2 −2
Original line number Diff line number Diff line
@@ -509,8 +509,8 @@ static struct crypto_template *__crypto_lookup_template(const char *name) 


struct crypto_template *crypto_lookup_template(const char *name)

{

	return try_then_request_module(__crypto_lookup_template(name), "%s",

				       name);

	return try_then_request_module(__crypto_lookup_template(name),

				       "crypto-%s", name);

}

EXPORT_SYMBOL_GPL(crypto_lookup_template);

crypto/authenc.c

+1 −0
Original line number Diff line number Diff line
@@ -721,3 +721,4 @@ module_exit(crypto_authenc_module_exit); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Simple AEAD wrapper for IPsec");

MODULE_ALIAS_CRYPTO("authenc");

crypto/authencesn.c

+1 −0
Original line number Diff line number Diff line
@@ -814,3 +814,4 @@ module_exit(crypto_authenc_esn_module_exit); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");

MODULE_DESCRIPTION("AEAD wrapper for IPsec with extended sequence numbers");

MODULE_ALIAS_CRYPTO("authencesn");

crypto/cbc.c

+1 −0
Original line number Diff line number Diff line
@@ -289,3 +289,4 @@ module_exit(crypto_cbc_module_exit); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("CBC block cipher algorithm");

MODULE_ALIAS_CRYPTO("cbc");