Commit 923ea163 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'integrity-v5.8-fix' of... 

Merge tag 'integrity-v5.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

Pull integrity fix from Mimi Zohar:
 "ima mprotect performance fix"

* tag 'integrity-v5.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: fix mprotect checking
parents 4071b856 4235b1a4

security/integrity/ima/ima_main.c

+2 −1
Original line number Diff line number Diff line
@@ -419,7 +419,8 @@ int ima_file_mprotect(struct vm_area_struct *vma, unsigned long prot) 
	int pcr;



	/* Is mprotect making an mmap'ed file executable? */

	if (!vma->vm_file || !(prot & PROT_EXEC) || (vma->vm_flags & VM_EXEC))

	if (!(ima_policy_flag & IMA_APPRAISE) || !vma->vm_file ||

	    !(prot & PROT_EXEC) || (vma->vm_flags & VM_EXEC))

		return 0;



	security_task_getsecid(current, &secid);

CRA Git | Maintained and supported by SUSTech CRA and CCSE