summaryrefslogtreecommitdiff
path: root/security/integrity
diff options
context:
space:
mode:
authorStefan Berger <stefanb@linux.ibm.com>2022-01-26 01:46:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-16 14:52:47 +0300
commit0939988b16a4434a10ba9ed10bee144ba05c8442 (patch)
tree47d0dd9bb0d1c9526039087cb90959141fc4fc24 /security/integrity
parentea58704f06f17b2111c35fe1d1dab6f3a2b46f81 (diff)
downloadlinux-0939988b16a4434a10ba9ed10bee144ba05c8442.tar.xz
ima: Remove ima_policy file before directory
commit f7333b9572d0559e00352a926c92f29f061b4569 upstream. The removal of ima_dir currently fails since ima_policy still exists, so remove the ima_policy file before removing the directory. Fixes: 4af4662fa4a9 ("integrity: IMA policy") Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Cc: <stable@vger.kernel.org> Acked-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/ima/ima_fs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 68571c40d61f..a3e6fccff712 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -494,12 +494,12 @@ int __init ima_fs_init(void)
return 0;
out:
+ securityfs_remove(ima_policy);
securityfs_remove(violations);
securityfs_remove(runtime_measurements_count);
securityfs_remove(ascii_runtime_measurements);
securityfs_remove(binary_runtime_measurements);
securityfs_remove(ima_symlink);
securityfs_remove(ima_dir);
- securityfs_remove(ima_policy);
return -1;
}