diff options
| author | Ard Biesheuvel <[email protected]> | 2019-11-05 16:01:00 +0200 |
|---|---|---|
| committer | Herbert Xu <[email protected]> | 2019-12-11 16:36:59 +0800 |
| commit | dbb326fd009346061e5083c3a0d2d1a2fa348e04 (patch) | |
| tree | a093c3f708d3f2a7dcf388bc693c4d0c4056a66e | |
| parent | 6585cd3683c624d9cbe5cbc480f870b2d1df47db (diff) | |
crypto: omap-aes - reject invalid input sizes for block modes
Block modes such as ECB and CBC only support input sizes that are
a round multiple of the block size, so align with the generic code
which returns -EINVAL when encountering inputs that violate this
rule.
Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Tero Kristo <[email protected]>
Tested-by: Tero Kristo <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
| -rw-r--r-- | drivers/crypto/omap-aes.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index de05b35283bf..067f4cd7c005 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -525,6 +525,9 @@ static int omap_aes_crypt(struct skcipher_request *req, unsigned long mode) struct omap_aes_dev *dd; int ret; + if ((req->cryptlen % AES_BLOCK_SIZE) && !(mode & FLAGS_CTR)) + return -EINVAL; + pr_debug("nbytes: %d, enc: %d, cbc: %d\n", req->cryptlen, !!(mode & FLAGS_ENCRYPT), !!(mode & FLAGS_CBC)); |