Commit ac2409a5 authored Jun 05, 2018 by Sudeep Holla Committed by Mimi Zohar Jul 18, 2018

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>

parent dba31ee7

security/integrity/iint.c

+6 −3

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