Commit 1dd28064 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'integrity-v6.10-fix' of... 

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

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
parents d270dd21 fbf06cee

security/integrity/ima/ima_fs.c

+1 −2
Original line number Diff line number Diff line
@@ -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);