diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 00:48:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 00:48:06 -0400 |
| commit | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (patch) | |
| tree | 27a73405d3652dc6771fab28721b70e6d44ff47a /crypto/api.c | |
| parent | b1459461f1e0abd5c28317d6bff6f2ca612a719d (diff) | |
| parent | 1b40efd772f4419fbc1a8940506424246985c333 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Diffstat (limited to 'crypto/api.c')
| -rw-r--r-- | crypto/api.c | 5 |
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) | |||
| 215 | if (alg->cra_alignmask & (alg->cra_alignmask + 1)) | 215 | if (alg->cra_alignmask & (alg->cra_alignmask + 1)) |
| 216 | return -EINVAL; | 216 | return -EINVAL; |
| 217 | 217 | ||
| 218 | if (alg->cra_alignmask > PAGE_SIZE) | 218 | if (alg->cra_alignmask & alg->cra_blocksize) |
| 219 | return -EINVAL; | ||
| 220 | |||
| 221 | if (alg->cra_blocksize > PAGE_SIZE) | ||
| 219 | return -EINVAL; | 222 | return -EINVAL; |
| 220 | 223 | ||
| 221 | down_write(&crypto_alg_sem); | 224 | down_write(&crypto_alg_sem); |