diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
| commit | 13ea3300100ec3461560b1e061033cd167333a86 (patch) | |
| tree | c60a016a06c488adada6959516e2a2de96d6d7d3 /security/integrity/ima/ima_template_lib.c | |
| parent | b7ed6b88b2a5e961eeb939ef637a3cbb435a23a7 (diff) | |
| parent | 68e67d97e1f91ed11e041b67f3a1336f518c608f (diff) | |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi
Diffstat (limited to 'security/integrity/ima/ima_template_lib.c')
| -rw-r--r-- | security/integrity/ima/ima_template_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c index 6d66ad6ed26..c38adcc910f 100644 --- a/security/integrity/ima/ima_template_lib.c +++ b/security/integrity/ima/ima_template_lib.c @@ -109,9 +109,12 @@ static void ima_show_template_data_binary(struct seq_file *m, enum data_formats datafmt, struct ima_field_data *field_data) { - ima_putc(m, &field_data->len, sizeof(u32)); + if (show != IMA_SHOW_BINARY_NO_FIELD_LEN) + ima_putc(m, &field_data->len, sizeof(u32)); + if (!field_data->len) return; + ima_putc(m, field_data->data, field_data->len); } @@ -125,6 +128,7 @@ static void ima_show_template_field_data(struct seq_file *m, ima_show_template_data_ascii(m, show, datafmt, field_data); break; case IMA_SHOW_BINARY: + case IMA_SHOW_BINARY_NO_FIELD_LEN: ima_show_template_data_binary(m, show, datafmt, field_data); break; default: |