summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-10-03 07:15:36 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2005-10-30 02:19:43 +0200
commit1b40efd772f4419fbc1a8940506424246985c333 (patch)
tree0f1ade69806e7f02196534b008ef8d2c925bf34b /crypto
parent[CRYPTO] Simplify one-member scatterlist expressions (diff)
downloadlinux-1b40efd772f4419fbc1a8940506424246985c333.tar.xz
linux-1b40efd772f4419fbc1a8940506424246985c333.zip
[CRYPTO] Check cra_alignmask against cra_blocksize
The cipher code relies on the fact that the block size is a multiple of the required alignment. So we should check this at the time of algorith registration. We also ensure that the block size is bounded by the page size. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/api.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/api.c b/crypto/api.c
index 959c4e5f264f..40ae42e9b6a6 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -215,7 +215,10 @@ int crypto_register_alg(struct crypto_alg *alg)
if (alg->cra_alignmask & (alg->cra_alignmask + 1))
return -EINVAL;
- if (alg->cra_alignmask > PAGE_SIZE)
+ if (alg->cra_alignmask & alg->cra_blocksize)
+ return -EINVAL;
+
+ if (alg->cra_blocksize > PAGE_SIZE)
return -EINVAL;
down_write(&crypto_alg_sem);