Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04288f42 authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

integrity: ima audit dentry_open failure 



Until we start appraising measurements, the ima_path_check()
return code should always be 0.

- Update the ima_path_check() return code comment
- Instead of the pr_info, audit the dentry_open failure

Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Acked-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent bcb86975

security/integrity/ima/ima_main.c

+9 −4
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ static void ima_update_counts(struct ima_iint_cache *iint, int mask) 
 *	- Opening a file for read when already open for write,

 * 	  could result in a file measurement error.

 *

 * Return 0 on success, an error code on failure.

 * (Based on the results of appraise_measurement().)

 * Always return 0 and audit dentry_open failures.

 * (Return code will be based upon measurement appraisal.)

 */

int ima_path_check(struct path *path, int mask, int update_counts)

{
@@ -189,8 +189,13 @@ int ima_path_check(struct path *path, int mask, int update_counts) 
		file = dentry_open(dentry, mnt, O_RDONLY | O_LARGEFILE,

				   current_cred());

		if (IS_ERR(file)) {

			pr_info("%s dentry_open failed\n", dentry->d_name.name);

			rc = PTR_ERR(file);

			int audit_info = 0;



			integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode,

					    dentry->d_name.name,

					    "add_measurement",

					    "dentry_open failed",

					    1, audit_info);

			file = NULL;

			goto out;

		}