Skip to content

Commit c21632b

Browse files
stefanbergermimizohar
authored andcommitted
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: Amir Goldstein <amir73il@gmail.com> Co-developed-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Acked-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
1 parent 38aa3f5 commit c21632b

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

security/integrity/ima/ima_main.c

+10-8
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ static int process_measurement(struct file *file, const struct cred *cred,
208208
u32 secid, char *buf, loff_t size, int mask,
209209
enum ima_hooks func)
210210
{
211-
struct inode *backing_inode, *inode = file_inode(file);
211+
struct inode *real_inode, *inode = file_inode(file);
212212
struct ima_iint_cache *iint = NULL;
213213
struct ima_template_desc *template_desc = NULL;
214214
char *pathbuf = NULL;
@@ -285,14 +285,16 @@ static int process_measurement(struct file *file, const struct cred *cred,
285285
iint->measured_pcrs = 0;
286286
}
287287

288-
/* Detect and re-evaluate changes made to the backing file. */
289-
backing_inode = d_real_inode(file_dentry(file));
290-
if (backing_inode != inode &&
288+
/*
289+
* On stacked filesystems, detect and re-evaluate file data changes.
290+
*/
291+
real_inode = d_real_inode(file_dentry(file));
292+
if (real_inode != inode &&
291293
(action & IMA_DO_MASK) && (iint->flags & IMA_DONE_MASK)) {
292-
if (!IS_I_VERSION(backing_inode) ||
293-
backing_inode->i_sb->s_dev != iint->real_dev ||
294-
backing_inode->i_ino != iint->real_ino ||
295-
!inode_eq_iversion(backing_inode, iint->version)) {
294+
if (!IS_I_VERSION(real_inode) ||
295+
real_inode->i_sb->s_dev != iint->real_dev ||
296+
real_inode->i_ino != iint->real_ino ||
297+
!inode_eq_iversion(real_inode, iint->version)) {
296298
iint->flags &= ~IMA_DONE_MASK;
297299
iint->measured_pcrs = 0;
298300
}

0 commit comments

Comments
 (0)