diff options
| author | Roberto Sassu | 2013-12-02 19:40:34 +0100 |
|---|---|---|
| committer | Mimi Zohar | 2013-12-03 02:46:56 +0100 |
| commit | a7ed7c60e14df5b986f93549717235b882643e7e (patch) | |
| tree | 7e615a0664541d91f99c5875164b335b74fd8d8d /security/integrity/ima/ima.h | |
| parent | ima: Do not free 'entry' before it is initialized (diff) | |
| download | kernel-qcow2-linux-a7ed7c60e14df5b986f93549717235b882643e7e.tar.gz kernel-qcow2-linux-a7ed7c60e14df5b986f93549717235b882643e7e.tar.xz kernel-qcow2-linux-a7ed7c60e14df5b986f93549717235b882643e7e.zip | |
ima: properly free ima_template_entry structures
The new templates management mechanism records information associated
to an event into an array of 'ima_field_data' structures and makes it
available through the 'template_data' field of the 'ima_template_entry'
structure (the element of the measurements list created by IMA).
Since 'ima_field_data' contains dynamically allocated data (which length
varies depending on the data associated to a selected template field),
it is not enough to just free the memory reserved for a
'ima_template_entry' structure if something goes wrong.
This patch creates the new function ima_free_template_entry() which
walks the array of 'ima_field_data' structures, frees the memory
referenced by the 'data' pointer and finally the space reserved for
the 'ima_template_entry' structure. Further, it replaces existing kfree()
that have a pointer to an 'ima_template_entry' structure as argument
with calls to the new function.
Fixes: a71dc65: ima: switch to new template management mechanism
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima.h')
| -rw-r--r-- | security/integrity/ima/ima.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 9636e17c9f5d..0356e1d437ca 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -148,6 +148,7 @@ int ima_alloc_init_template(struct integrity_iint_cache *iint, int xattr_len, struct ima_template_entry **entry); int ima_store_template(struct ima_template_entry *entry, int violation, struct inode *inode, const unsigned char *filename); +void ima_free_template_entry(struct ima_template_entry *entry); const char *ima_d_path(struct path *path, char **pathbuf); /* rbtree tree calls to lookup, insert, delete |