summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-06-01 11:00:05 +0300
committerMimi Zohar <zohar@linux.vnet.ibm.com>2018-06-01 06:03:08 -0400
commitb5c90a7526fe39164c2204f0404ce8f8ff21e522 (patch)
treeb1b82612e32e0d5a493b6cb1e604642627850723 /security
parenta41d80acfa2764e9b1ce49aa303a263e609d91f7 (diff)
downloadlinux-b5c90a7526fe39164c2204f0404ce8f8ff21e522.tar.gz
linux-b5c90a7526fe39164c2204f0404ce8f8ff21e522.tar.bz2
linux-b5c90a7526fe39164c2204f0404ce8f8ff21e522.zip
EVM: unlock on error path in evm_read_xattrs()
We need to unlock before returning on this error path. Fixes: fa516b66a1bf ("EVM: Allow runtime modification of the set of verified xattrs") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/evm/evm_secfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c
index 3cefef3919e5..637eb999e340 100644
--- a/security/integrity/evm/evm_secfs.c
+++ b/security/integrity/evm/evm_secfs.c
@@ -147,8 +147,10 @@ static ssize_t evm_read_xattrs(struct file *filp, char __user *buf,
size += strlen(xattr->name) + 1;
temp = kmalloc(size + 1, GFP_KERNEL);
- if (!temp)
+ if (!temp) {
+ mutex_unlock(&xattr_list_mutex);
return -ENOMEM;
+ }
list_for_each_entry(xattr, &evm_config_xattrnames, list) {
sprintf(temp + offset, "%s\n", xattr->name);