Skip to content

Commit

Permalink
Merge tag 'integrity-v6.10-fix' of ssh://ra.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Jul 5, 2024
2 parents d270dd2 + fbf06ce commit 1dd2806
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions security/integrity/ima/ima_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 1dd2806

Please sign in to comment.