Skip to content

Commit 455b6c9

Browse files
robertosassumimizohar
authored andcommitted
evm: Check size of security.evm before using it
This patch checks the size for the EVM_IMA_XATTR_DIGSIG and EVM_XATTR_PORTABLE_DIGSIG types to ensure that the algorithm is read from the buffer returned by vfs_getxattr_alloc(). Cc: stable@vger.kernel.org # 4.19.x Fixes: 5feeb61 ("evm: Allow non-SHA1 digital signatures") Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
1 parent 4be92db commit 455b6c9

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

security/integrity/evm/evm_main.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,12 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
184184
break;
185185
case EVM_IMA_XATTR_DIGSIG:
186186
case EVM_XATTR_PORTABLE_DIGSIG:
187+
/* accept xattr with non-empty signature field */
188+
if (xattr_len <= sizeof(struct signature_v2_hdr)) {
189+
evm_status = INTEGRITY_FAIL;
190+
goto out;
191+
}
192+
187193
hdr = (struct signature_v2_hdr *)xattr_data;
188194
digest.hdr.algo = hdr->hash_algo;
189195
rc = evm_calc_hash(dentry, xattr_name, xattr_value,

0 commit comments

Comments
 (0)