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

Commit 37bcbf13 authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

IMA: use current_cred() instead of current->cred 



Proper invocation of the current credentials is to use current_cred() not
current->cred.  This patches makes IMA use the new method.

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

security/integrity/ima/ima_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode, 


	ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno);

	audit_log_format(ab, "integrity: pid=%d uid=%u auid=%u ses=%u",

			 current->pid, current->cred->uid,

			 current->pid, current_cred()->uid,

			 audit_get_loginuid(current),

			 audit_get_sessionid(current));

	audit_log_task_context(ab);

security/integrity/ima/ima_main.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ int ima_path_check(struct path *path, int mask) 
		struct dentry *dentry = dget(path->dentry);

		struct vfsmount *mnt = mntget(path->mnt);



		file = dentry_open(dentry, mnt, O_RDONLY, current->cred);

		file = dentry_open(dentry, mnt, O_RDONLY, current_cred());

		rc = get_path_measurement(iint, file, dentry->d_name.name);

	}

out: