On 12-01-2017 21:39, Herbert Xu wrote:
> On Fri, Jan 06, 2017 at 02:01:34PM +0530, Harsh Jain wrote:
>> Check keylen before copying salt to avoid wrap around of Integer.
>>
>> Signed-off-by: Harsh Jain <ha...@chelsio.com>
>> ---
>> drivers/crypto/chelsio/chcr_algo.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/crypto/chelsio/chcr_algo.c
>> b/drivers/crypto/chelsio/chcr_algo.c
>> index deec7c0..6c2dea3 100644
>> --- a/drivers/crypto/chelsio/chcr_algo.c
>> +++ b/drivers/crypto/chelsio/chcr_algo.c
>> @@ -2194,8 +2194,8 @@ static int chcr_gcm_setkey(struct crypto_aead *aead,
>> const u8 *key,
>> unsigned int ck_size;
>> int ret = 0, key_ctx_size = 0;
>>
>> - if (get_aead_subtype(aead) ==
>> - CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106) {
>> + if (get_aead_subtype(aead) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106 &&
>> + keylen > 3) {
>> keylen -= 4; /* nonce/salt is present in the last 4 bytes */
>> memcpy(aeadctx->salt, key + keylen, 4);
>> }
> We should return an error in this case.
That case is already handled in next if condition.It will error out with
-EINVAL in next condition.
if (keylen == AES_KEYSIZE_128) {
>
> Cheers,
