Merge tag 'integrity-v6.10-fix' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

torvalds · torvalds · commit 1dd28064d416 · 2024-07-05T16:21:54.000-07:00
Pull integrity fix from Mimi Zohar:
 "A single bug fix to properly remove all of the securityfs IMA
  measurement lists"

* tag 'integrity-v6.10-fix' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: fix wrong zero-assignment during securityfs dentry remove
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
@@ -427,8 +427,6 @@ static void __init remove_securityfs_measurement_lists(struct dentry **lists)
 
 		kfree(lists);
 	}
-
-	securityfs_measurement_list_count = 0;
 }
 
 static int __init create_securityfs_measurement_lists(void)
@@ -625,6 +623,7 @@ int __init ima_fs_init(void)
 	securityfs_remove(binary_runtime_measurements);
 	remove_securityfs_measurement_lists(ascii_securityfs_measurement_lists);
 	remove_securityfs_measurement_lists(binary_securityfs_measurement_lists);
+	securityfs_measurement_list_count = 0;
 	securityfs_remove(ima_symlink);
 	securityfs_remove(ima_dir);
 

Original file line number	Diff line number	Diff line change
`@@ -427,8 +427,6 @@ static void __init remove_securityfs_measurement_lists(struct dentry **lists)`
`427`	`427`
`428`	`428`	`kfree(lists);`
`429`	`429`	`}`
`430`		`-`
`431`		`- securityfs_measurement_list_count = 0;`
`432`	`430`	`}`
`433`	`431`
`434`	`432`	`static int __init create_securityfs_measurement_lists(void)`
`@@ -625,6 +623,7 @@ int __init ima_fs_init(void)`
`625`	`623`	`securityfs_remove(binary_runtime_measurements);`
`626`	`624`	`remove_securityfs_measurement_lists(ascii_securityfs_measurement_lists);`
`627`	`625`	`remove_securityfs_measurement_lists(binary_securityfs_measurement_lists);`
	`626`	`+ securityfs_measurement_list_count = 0;`
`628`	`627`	`securityfs_remove(ima_symlink);`
`629`	`628`	`securityfs_remove(ima_dir);`
`630`	`629`