Skip to content

Commit

Permalink
evm: check hash algorithm passed to init_desc()
Browse files Browse the repository at this point in the history
This patch prevents memory access beyond the evm_tfm array by checking the
validity of the index (hash algorithm) passed to init_desc(). The hash
algorithm can be arbitrarily set if the security.ima xattr type is not
EVM_XATTR_HMAC.

Fixes: 5feeb61 ("evm: Allow non-SHA1 digital signatures")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
  • Loading branch information
robertosassu authored and mimizohar committed May 30, 2019
1 parent f400194 commit 221be10
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions security/integrity/evm/evm_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo)
tfm = &hmac_tfm;
algo = evm_hmac;
} else {
if (hash_algo >= HASH_ALGO__LAST)
return ERR_PTR(-EINVAL);

tfm = &evm_tfm[hash_algo];
algo = hash_algo_name[hash_algo];
}
Expand Down

0 comments on commit 221be10

Please sign in to comment.