OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stefan Berger 2024-02-23 12:25:04 -05:00 committed by Mimi Zohar
parent 38aa3f5ac6
commit c21632b668
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/integrity/ima/ima_main.c
View File

@ -208,7 +208,7 @@ static int process_measurement(struct file *file, const struct cred *cred,
u32 secid, char *buf, loff_t size, int mask, u32 secid, char *buf, loff_t size, int mask,
enum ima_hooks func) 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_iint_cache *iint = NULL;
struct ima_template_desc *template_desc = NULL; struct ima_template_desc *template_desc = NULL;
char *pathbuf = NULL; char *pathbuf = NULL;
@ -285,14 +285,16 @@ static int process_measurement(struct file *file, const struct cred *cred,
iint->measured_pcrs = 0; iint->measured_pcrs = 0;
} }
/* Detect and re-evaluate changes made to the backing file. */ /*
backing_inode = d_real_inode(file_dentry(file)); * On stacked filesystems, detect and re-evaluate file data changes.
if (backing_inode != inode && */
real_inode = d_real_inode(file_dentry(file));
if (real_inode != inode &&
(action & IMA_DO_MASK) && (iint->flags & IMA_DONE_MASK)) { (action & IMA_DO_MASK) && (iint->flags & IMA_DONE_MASK)) {
if (!IS_I_VERSION(backing_inode) || if (!IS_I_VERSION(real_inode) ||
backing_inode->i_sb->s_dev != iint->real_dev || real_inode->i_sb->s_dev != iint->real_dev ||
backing_inode->i_ino != iint->real_ino || real_inode->i_ino != iint->real_ino ||
!inode_eq_iversion(backing_inode, iint->version)) { !inode_eq_iversion(real_inode, iint->version)) {
iint->flags &= ~IMA_DONE_MASK; iint->flags &= ~IMA_DONE_MASK;
iint->measured_pcrs = 0; iint->measured_pcrs = 0;
} }