diff options
author | Roberto Sassu <roberto.sassu@polito.it> | 2014-10-13 08:08:38 -0400 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-10-13 08:39:01 -0400 |
commit | 71fed2eee0ea76b236f491006078c9d636323184 (patch) | |
tree | a088eed632515837503be22bfbceecd2916ea26b /security/integrity | |
parent | 0716abbb58e3c47e04354c2502083854f49c34e5 (diff) |
ima: added error messages to template-related functions
This patch adds some error messages to inform users about the following
events: template descriptor not found, invalid template descriptor,
template field not found and template initialization failed.
Changelog:
- v2:
- display an error message if the format string contains too many
fields (Roberto Sassu)
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity')
-rw-r--r-- | security/integrity/ima/ima_template.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c index e854862c9337..1310afc587f3 100644 --- a/security/integrity/ima/ima_template.c +++ b/security/integrity/ima/ima_template.c | |||
@@ -52,8 +52,11 @@ static int __init ima_template_setup(char *str) | |||
52 | * If not, use CONFIG_IMA_DEFAULT_TEMPLATE. | 52 | * If not, use CONFIG_IMA_DEFAULT_TEMPLATE. |
53 | */ | 53 | */ |
54 | template_desc = lookup_template_desc(str); | 54 | template_desc = lookup_template_desc(str); |
55 | if (!template_desc) | 55 | if (!template_desc) { |
56 | pr_err("template %s not found, using %s\n", | ||
57 | str, CONFIG_IMA_DEFAULT_TEMPLATE); | ||
56 | return 1; | 58 | return 1; |
59 | } | ||
57 | 60 | ||
58 | /* | 61 | /* |
59 | * Verify whether the current hash algorithm is supported | 62 | * Verify whether the current hash algorithm is supported |
@@ -117,8 +120,11 @@ static int template_desc_init_fields(const char *template_fmt, | |||
117 | int template_num_fields = template_fmt_size(template_fmt); | 120 | int template_num_fields = template_fmt_size(template_fmt); |
118 | int i, result = 0; | 121 | int i, result = 0; |
119 | 122 | ||
120 | if (template_num_fields > IMA_TEMPLATE_NUM_FIELDS_MAX) | 123 | if (template_num_fields > IMA_TEMPLATE_NUM_FIELDS_MAX) { |
124 | pr_err("format string '%s' contains too many fields\n", | ||
125 | template_fmt); | ||
121 | return -EINVAL; | 126 | return -EINVAL; |
127 | } | ||
122 | 128 | ||
123 | /* copying is needed as strsep() modifies the original buffer */ | 129 | /* copying is needed as strsep() modifies the original buffer */ |
124 | template_fmt_copy = kstrdup(template_fmt, GFP_KERNEL); | 130 | template_fmt_copy = kstrdup(template_fmt, GFP_KERNEL); |
@@ -137,6 +143,7 @@ static int template_desc_init_fields(const char *template_fmt, | |||
137 | struct ima_template_field *f = lookup_template_field(c); | 143 | struct ima_template_field *f = lookup_template_field(c); |
138 | 144 | ||
139 | if (!f) { | 145 | if (!f) { |
146 | pr_err("field '%s' not found\n", c); | ||
140 | result = -ENOENT; | 147 | result = -ENOENT; |
141 | goto out; | 148 | goto out; |
142 | } | 149 | } |
@@ -163,8 +170,13 @@ struct ima_template_desc *ima_template_desc_current(void) | |||
163 | int __init ima_init_template(void) | 170 | int __init ima_init_template(void) |
164 | { | 171 | { |
165 | struct ima_template_desc *template = ima_template_desc_current(); | 172 | struct ima_template_desc *template = ima_template_desc_current(); |
173 | int result; | ||
166 | 174 | ||
167 | return template_desc_init_fields(template->fmt, | 175 | result = template_desc_init_fields(template->fmt, |
168 | &(template->fields), | 176 | &(template->fields), |
169 | &(template->num_fields)); | 177 | &(template->num_fields)); |
178 | if (result < 0) | ||
179 | pr_err("template %s init failed, result: %d\n", template->name); | ||
180 | |||
181 | return result; | ||
170 | } | 182 | } |