summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-07-11 13:28:40 +0000
committerMimi Zohar <zohar@linux.ibm.com>2018-07-22 14:49:11 -0400
commit3dd0f18c70d94ca2432c78c5735744429f071b0b (patch)
tree2e6f6197b0545d4ae84cdf35382981b0a0c0ecca /security
parent6eb864c1d9dd1ef32b88e03c3f49d8be0dab7dcf (diff)
downloadlinux-stable-3dd0f18c70d94ca2432c78c5735744429f071b0b.tar.gz
linux-stable-3dd0f18c70d94ca2432c78c5735744429f071b0b.tar.bz2
linux-stable-3dd0f18c70d94ca2432c78c5735744429f071b0b.zip
EVM: fix return value check in evm_write_xattrs()
In case of error, the function audit_log_start() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: fa516b66a1bf ("EVM: Allow runtime modification of the set of verified xattrs") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/evm/evm_secfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c
index 637eb999e340..77de71b7794c 100644
--- a/security/integrity/evm/evm_secfs.c
+++ b/security/integrity/evm/evm_secfs.c
@@ -193,8 +193,8 @@ static ssize_t evm_write_xattrs(struct file *file, const char __user *buf,
return -E2BIG;
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_INTEGRITY_EVM_XATTR);
- if (IS_ERR(ab))
- return PTR_ERR(ab);
+ if (!ab)
+ return -ENOMEM;
xattr = kmalloc(sizeof(struct xattr_list), GFP_KERNEL);
if (!xattr) {