summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@huawei.com>2020-04-14 10:01:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-22 09:05:21 +0200
commit3815f6508d90a7e7c86719a0009fd4bb6b89ad2b (patch)
treea7271ef1d4be52f7fb7495de263f2f1fed911dba /security
parentd52a190318f0901965f200f76eb28dd8426bbb25 (diff)
downloadlinux-stable-3815f6508d90a7e7c86719a0009fd4bb6b89ad2b.tar.gz
linux-stable-3815f6508d90a7e7c86719a0009fd4bb6b89ad2b.tar.bz2
linux-stable-3815f6508d90a7e7c86719a0009fd4bb6b89ad2b.zip
evm: Fix possible memory leak in evm_calc_hmac_or_hash()
commit 0c4395fb2aa77341269ea619c5419ea48171883f upstream. Don't immediately return if the signature is portable and security.ima is not present. Just set error so that memory allocated is freed before returning from evm_calc_hmac_or_hash(). Fixes: 50b977481fce9 ("EVM: Add support for portable signature format") Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Cc: stable@vger.kernel.org Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/evm/evm_crypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index d20f5792761c..fc142d04d365 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -249,7 +249,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
/* Portable EVM signatures must include an IMA hash */
if (type == EVM_XATTR_PORTABLE_DIGSIG && !ima_present)
- return -EPERM;
+ error = -EPERM;
out:
kfree(xattr_value);
kfree(desc);