lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ixp4xx - Fix qmgr_request_queue build failure
  crypto: api - Fix module load deadlock with fallback algorithms
This commit is contained in:
Linus Torvalds
2009-03-03 17:05:08 -08:00
parent 219f170a85 1777f1a978
commit 9c1a774705
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/crypto/aes_s390.c
View File

@@ -556,7 +556,7 @@ static void __exit aes_s390_fini(void)
module_init(aes_s390_init); module_init(aes_s390_init);
module_exit(aes_s390_fini); module_exit(aes_s390_fini);
MODULE_ALIAS("aes"); MODULE_ALIAS("aes-all");
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

15
crypto/api.c
View File

@@ -215,8 +215,19 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
mask &= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD); mask &= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD);
type &= mask; type &= mask;
alg = try_then_request_module(crypto_alg_lookup(name, type, mask), alg = crypto_alg_lookup(name, type, mask);
name); if (!alg) {
char tmp[CRYPTO_MAX_ALG_NAME];
request_module(name);
if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) &&
snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp))
request_module(tmp);
alg = crypto_alg_lookup(name, type, mask);
}
if (alg) if (alg)
return crypto_is_larval(alg) ? crypto_larval_wait(alg) : alg; return crypto_is_larval(alg) ? crypto_larval_wait(alg) : alg;

6
drivers/crypto/ixp4xx_crypto.c
View File

@@ -457,10 +457,12 @@ static int init_ixp_crypto(void)
if (!ctx_pool) { if (!ctx_pool) {
goto err; goto err;
} }
ret = qmgr_request_queue(SEND_QID, NPE_QLEN_TOTAL, 0, 0); ret = qmgr_request_queue(SEND_QID, NPE_QLEN_TOTAL, 0, 0,
"ixp_crypto:out", NULL);
if (ret) if (ret)
goto err; goto err;
ret = qmgr_request_queue(RECV_QID, NPE_QLEN, 0, 0); ret = qmgr_request_queue(RECV_QID, NPE_QLEN, 0, 0,
"ixp_crypto:in", NULL);
if (ret) { if (ret) {
qmgr_release_queue(SEND_QID); qmgr_release_queue(SEND_QID);
goto err; goto err;

2
drivers/crypto/padlock-aes.c
View File

@@ -489,4 +489,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algorithm support");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michal Ludvig"); MODULE_AUTHOR("Michal Ludvig");
MODULE_ALIAS("aes"); MODULE_ALIAS("aes-all");

4
drivers/crypto/padlock-sha.c
View File

@@ -304,7 +304,7 @@ MODULE_DESCRIPTION("VIA PadLock SHA1/SHA256 algorithms support.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michal Ludvig"); MODULE_AUTHOR("Michal Ludvig");
MODULE_ALIAS("sha1"); MODULE_ALIAS("sha1-all");
MODULE_ALIAS("sha256"); MODULE_ALIAS("sha256-all");
MODULE_ALIAS("sha1-padlock"); MODULE_ALIAS("sha1-padlock");
MODULE_ALIAS("sha256-padlock"); MODULE_ALIAS("sha256-padlock");