aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2018-06-05 06:25:45 -0400
committerMimi Zohar <zohar@linux.vnet.ibm.com>2018-07-18 07:27:22 -0400
commitac2409a521f7ec5978fd582567398d19f4a2fdbd (patch)
tree11c611f2780e7d717c5adb54cdd3807eaef59e86
parentdba31ee759417ef1a952e929524b0cca1751c036 (diff)
integrity: silence warning when CONFIG_SECURITYFS is not enabled
When CONFIG_SECURITYFS is not enabled, securityfs_create_dir returns -ENODEV which throws the following error: "Unable to create integrity sysfs dir: -19" However, if the feature is disabled, it can't be warning and hence we need to silence the error. This patch checks for the error -ENODEV which is returned when CONFIG_SECURITYFS is disabled to stop the error being thrown. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Matthew Garrett <mjg59@google.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
-rw-r--r--security/integrity/iint.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/security/integrity/iint.c b/security/integrity/iint.c
index 149faa81f6f0..5a6810041e5c 100644
--- a/security/integrity/iint.c
+++ b/security/integrity/iint.c
@@ -219,10 +219,13 @@ static int __init integrity_fs_init(void)
219{ 219{
220 integrity_dir = securityfs_create_dir("integrity", NULL); 220 integrity_dir = securityfs_create_dir("integrity", NULL);
221 if (IS_ERR(integrity_dir)) { 221 if (IS_ERR(integrity_dir)) {
222 pr_err("Unable to create integrity sysfs dir: %ld\n", 222 int ret = PTR_ERR(integrity_dir);
223 PTR_ERR(integrity_dir)); 223
224 if (ret != -ENODEV)
225 pr_err("Unable to create integrity sysfs dir: %d\n",
226 ret);
224 integrity_dir = NULL; 227 integrity_dir = NULL;
225 return PTR_ERR(integrity_dir); 228 return ret;
226 } 229 }
227 230
228 return 0; 231 return 0;