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

ima: Rename backing_inode to real_inode 



Rename the backing_inode variable to real_inode since it gets its value
from real_inode().

Suggested-by: default avatarAmir Goldstein <amir73il@gmail.com>
Co-developed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Acked-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent 38aa3f5a

security/integrity/ima/ima_main.c

+10 −8
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int process_measurement(struct file *file, const struct cred *cred, 
			       u32 secid, char *buf, loff_t size, int mask,

			       enum ima_hooks func)

{

	struct inode *backing_inode, *inode = file_inode(file);

	struct inode *real_inode, *inode = file_inode(file);

	struct ima_iint_cache *iint = NULL;

	struct ima_template_desc *template_desc = NULL;

	char *pathbuf = NULL;
@@ -285,14 +285,16 @@ static int process_measurement(struct file *file, const struct cred *cred, 
		iint->measured_pcrs = 0;

	}



	/* Detect and re-evaluate changes made to the backing file. */

	backing_inode = d_real_inode(file_dentry(file));

	if (backing_inode != inode &&

	/*

	 * On stacked filesystems, detect and re-evaluate file data changes.

	 */

	real_inode = d_real_inode(file_dentry(file));

	if (real_inode != inode &&

	    (action & IMA_DO_MASK) && (iint->flags & IMA_DONE_MASK)) {

		if (!IS_I_VERSION(backing_inode) ||

		    backing_inode->i_sb->s_dev != iint->real_dev ||

		    backing_inode->i_ino != iint->real_ino ||

		    !inode_eq_iversion(backing_inode, iint->version)) {

		if (!IS_I_VERSION(real_inode) ||

		    real_inode->i_sb->s_dev != iint->real_dev ||

		    real_inode->i_ino != iint->real_ino ||

		    !inode_eq_iversion(real_inode, iint->version)) {

			iint->flags &= ~IMA_DONE_MASK;

			iint->measured_pcrs = 0;

		}