integrity: silence warning when CONFIG_SECURITYFS is not enabled
authorSudeep Holla <sudeep.holla@arm.com>
Tue, 5 Jun 2018 10:25:45 +0000 (11:25 +0100)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Wed, 18 Jul 2018 11:27:22 +0000 (07:27 -0400)
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>
security/integrity/iint.c

index 149faa8..5a68100 100644 (file)
@@ -219,10 +219,13 @@ static int __init integrity_fs_init(void)
 {
        integrity_dir = securityfs_create_dir("integrity", NULL);
        if (IS_ERR(integrity_dir)) {
-               pr_err("Unable to create integrity sysfs dir: %ld\n",
-                      PTR_ERR(integrity_dir));
+               int ret = PTR_ERR(integrity_dir);
+
+               if (ret != -ENODEV)
+                       pr_err("Unable to create integrity sysfs dir: %d\n",
+                              ret);
                integrity_dir = NULL;
-               return PTR_ERR(integrity_dir);
+               return ret;
        }
 
        return 0;