Commit e4e071ba authored by Stefan Berger's avatar Stefan Berger Committed by Mimi Zohar
Browse files

ima: Return error code obtained from securityfs functions 



If an error occurs when creating a securityfs file, return the exact
error code to the caller.

Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent 18848c71

security/integrity/ima/ima_fs.c

+23 −8
Original line number Diff line number Diff line
@@ -452,47 +452,61 @@ static const struct file_operations ima_measure_policy_ops = { 


int __init ima_fs_init(void)

{

	int ret;



	ima_dir = securityfs_create_dir("ima", integrity_dir);

	if (IS_ERR(ima_dir))

		return -1;

		return PTR_ERR(ima_dir);



	ima_symlink = securityfs_create_symlink("ima", NULL, "integrity/ima",

						NULL);

	if (IS_ERR(ima_symlink))

	if (IS_ERR(ima_symlink)) {

		ret = PTR_ERR(ima_symlink);

		goto out;

	}



	binary_runtime_measurements =

	    securityfs_create_file("binary_runtime_measurements",

				   S_IRUSR | S_IRGRP, ima_dir, NULL,

				   &ima_measurements_ops);

	if (IS_ERR(binary_runtime_measurements))

	if (IS_ERR(binary_runtime_measurements)) {

		ret = PTR_ERR(binary_runtime_measurements);

		goto out;

	}



	ascii_runtime_measurements =

	    securityfs_create_file("ascii_runtime_measurements",

				   S_IRUSR | S_IRGRP, ima_dir, NULL,

				   &ima_ascii_measurements_ops);

	if (IS_ERR(ascii_runtime_measurements))

	if (IS_ERR(ascii_runtime_measurements)) {

		ret = PTR_ERR(ascii_runtime_measurements);

		goto out;

	}



	runtime_measurements_count =

	    securityfs_create_file("runtime_measurements_count",

				   S_IRUSR | S_IRGRP, ima_dir, NULL,

				   &ima_measurements_count_ops);

	if (IS_ERR(runtime_measurements_count))

	if (IS_ERR(runtime_measurements_count)) {

		ret = PTR_ERR(runtime_measurements_count);

		goto out;

	}



	violations =

	    securityfs_create_file("violations", S_IRUSR | S_IRGRP,

				   ima_dir, NULL, &ima_htable_violations_ops);

	if (IS_ERR(violations))

	if (IS_ERR(violations)) {

		ret = PTR_ERR(violations);

		goto out;

	}



	ima_policy = securityfs_create_file("policy", POLICY_FILE_FLAGS,

					    ima_dir, NULL,

					    &ima_measure_policy_ops);

	if (IS_ERR(ima_policy))

	if (IS_ERR(ima_policy)) {

		ret = PTR_ERR(ima_policy);

		goto out;

	}



	return 0;

out:
@@ -503,5 +517,6 @@ int __init ima_fs_init(void) 
	securityfs_remove(binary_runtime_measurements);

	securityfs_remove(ima_symlink);

	securityfs_remove(ima_dir);

	return -1;



	return ret;

}