torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

Integrity fix for kernel 6.15-rc3

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQHNBAABCgA3FiEET37nTLf1dvVbFDawFAq+TsLIwHwFAmgHqskZHHJvYmVydG8u
 c2Fzc3VAaHVhd2VpLmNvbQAKCRAUCr5OwsjAfGMsDACgTyfL7OmGYZfaFqy5azVo
 42+2mC6jlI26lcvNDDyvHtaTzRcLDbGfGBocxWNb+/QH3bPqTj1BvrkQsp6In1Ks
 Zl/6HQVXVb+z9loXR1h7pEO4BSp1a5252PM/FuIJA8oNaJqmKNzJFoO4X9YHPmXy
 sXVp4w37G7BegvFUEvPN5DXy+BDvJnYPtPbxAwNzrx4I75PcJD7LzqSLOuiaeOtv
 z1uA1+z/i0llc85tKct47WalONCuza1r5j2l2U7f8i38QdlCsH04o/Ve1Z1sxe4d
 h1LgSuC2+Gl4K09fY3hevj82Bm5eZQnj33QxQbVBMEa7ZjnuoMC2Rkvl4sDoltlw
 kN0mWwHqqPZC+PFBnpGjqLbOIaARy9v902JPdvH8GptElQ1urCuJ1g5PlwbMWaAK
 MLf4FKDV96EPpWCcdEwGfQeAzQkcxX4+b5PgzBqCwMm7ybJg+sgsluQ1ghOohLPF
 p5gvdTSWPAemjBsztr8C+KoDwgwTsv4itWhigsNPKp0=
 =f0Af
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-04-22 09:36:45 -07:00
commit e4b51cb60e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;