Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0939988b authored by Stefan Berger's avatar Stefan Berger Committed by Greg Kroah-Hartman
Browse files

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: 4af4662f ("integrity: IMA policy")
Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Cc: <stable@vger.kernel.org>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea58704f

security/integrity/ima/ima_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}