3 files changed, 10 insertions, 4 deletions

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 0356e1d437ca..f79fa8be203c 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -27,7 +27,7 @@
 #include "../integrity.h"
 
 enum ima_show_type { IMA_SHOW_BINARY, IMA_SHOW_BINARY_NO_FIELD_LEN,
-                     IMA_SHOW_ASCII };
+                     IMA_SHOW_BINARY_OLD_STRING_FMT, IMA_SHOW_ASCII };
 enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
 
 /* digest size for IMA, fits SHA1 or MD5 */
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index db01125926bd..468a3ba3c539 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -160,6 +160,8 @@ static int ima_measurements_show(struct seq_file *m, void *v)
 
                 if (is_ima_template && strcmp(field->field_id, "d") == 0)
                         show = IMA_SHOW_BINARY_NO_FIELD_LEN;
+                if (is_ima_template && strcmp(field->field_id, "n") == 0)
+                        show = IMA_SHOW_BINARY_OLD_STRING_FMT;
                 field->field_show(m, show, &e->template_data[i]);
         }
         return 0;
diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
index 1683bbf289a4..e8592e7bfc21 100644
--- a/security/integrity/ima/ima_template_lib.c
+++ b/security/integrity/ima/ima_template_lib.c
@@ -109,13 +109,16 @@ static void ima_show_template_data_binary(struct seq_file *m,
                                           enum data_formats datafmt,
                                           struct ima_field_data *field_data)
 {
+        u32 len = (show == IMA_SHOW_BINARY_OLD_STRING_FMT) ?
+            strlen(field_data->data) : field_data->len;
+
         if (show != IMA_SHOW_BINARY_NO_FIELD_LEN)
-                ima_putc(m, &field_data->len, sizeof(u32));
+                ima_putc(m, &len, sizeof(len));
 
-        if (!field_data->len)
+        if (!len)
                 return;
 
-        ima_putc(m, field_data->data, field_data->len);
+        ima_putc(m, field_data->data, len);
 }
 
 static void ima_show_template_field_data(struct seq_file *m,
@@ -129,6 +132,7 @@ static void ima_show_template_field_data(struct seq_file *m,
                 break;
         case IMA_SHOW_BINARY:
         case IMA_SHOW_BINARY_NO_FIELD_LEN:
+        case IMA_SHOW_BINARY_OLD_STRING_FMT:
                 ima_show_template_data_binary(m, show, datafmt, field_data);
                 break;
         default: