Merge tag 'integrity-6.15-rc3-fix' of https://github.com/linux-integrity/linux

Pull integrity fix from Roberto Sassu:
"One performance fix to avoid unnecessarily taking the inode lock"

* tag 'integrity-6.15-rc3-fix' of https://github.com/linux-integrity/linux:
ima: process_measurement() needlessly takes inode_lock() on MAY_READ

+3 -1
+3 -1
security/integrity/ima/ima_main.c
··· 245 &allowed_algos); 246 violation_check = ((func == FILE_CHECK || func == MMAP_CHECK || 247 func == MMAP_CHECK_REQPROT) && 248 - (ima_policy_flag & IMA_MEASURE)); 249 if (!action && !violation_check) 250 return 0; 251
··· 245 &allowed_algos); 246 violation_check = ((func == FILE_CHECK || func == MMAP_CHECK || 247 func == MMAP_CHECK_REQPROT) && 248 + (ima_policy_flag & IMA_MEASURE) && 249 + ((action & IMA_MEASURE) || 250 + (file->f_mode & FMODE_WRITE))); 251 if (!action && !violation_check) 252 return 0; 253