diff options
| author | Stefan Berger <stefanb@linux.ibm.com> | 2022-01-25 17:46:23 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-16 12:51:43 +0100 |
| commit | 2c3beddb39ebe4411497629442f594133f29e0cd (patch) | |
| tree | a892c6f301c5f6c8dd14f6e987fd242663048ac2 /security | |
| parent | e9fa71bab4de31155eebb3074e29f49d6748fd1a (diff) | |
| download | linux-stable-2c3beddb39ebe4411497629442f594133f29e0cd.tar.gz linux-stable-2c3beddb39ebe4411497629442f594133f29e0cd.tar.bz2 linux-stable-2c3beddb39ebe4411497629442f594133f29e0cd.zip | |
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')
| -rw-r--r-- | security/integrity/ima/ima_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 604cdac63d84..38bd565b9da9 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -497,12 +497,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; } |