ima: Remove ima_policy file before directory
authorStefan Berger <stefanb@linux.ibm.com>
Tue, 25 Jan 2022 22:46:23 +0000 (17:46 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Feb 2022 11:43:52 +0000 (12:43 +0100)
commitdd842056ef7ca1dae78eb0ae1d6beaf1b767f666
treeda7901e74d0f6271dfbb3036c04ddd53d11704f9
parent9d75b8889739721b59c5731a68c06e7683e8360b
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>
security/integrity/ima/ima_fs.c