Commit e4b51cb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a33b5a08 30d68cb0

security/integrity/ima/ima_main.c

+3 −1
Original line number Diff line number Diff line
@@ -245,7 +245,9 @@ static int process_measurement(struct file *file, const struct cred *cred, 
				&allowed_algos);

	violation_check = ((func == FILE_CHECK || func == MMAP_CHECK ||

			    func == MMAP_CHECK_REQPROT) &&

			   (ima_policy_flag & IMA_MEASURE));

			   (ima_policy_flag & IMA_MEASURE) &&

			   ((action & IMA_MEASURE) ||

			    (file->f_mode & FMODE_WRITE)));

	if (!action && !violation_check)

		return 0;