summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-11-16 07:27:29 -0800
committerMimi Zohar <zohar@linux.vnet.ibm.com>2017-12-18 09:43:47 -0500
commit72bf83b0c978c495ce9f6bfeee1ccd34478b05e6 (patch)
treecba671b71110f4c62782dc0fb99eca229d8c7686 /security
parentda1b0029f527a9b4204e90ba6f14ee139fd76f9e (diff)
downloadlinux-stable-72bf83b0c978c495ce9f6bfeee1ccd34478b05e6.tar.gz
linux-stable-72bf83b0c978c495ce9f6bfeee1ccd34478b05e6.tar.bz2
linux-stable-72bf83b0c978c495ce9f6bfeee1ccd34478b05e6.zip
ima: Fix line continuation format
Line continuations with excess spacing causes unexpected output. Based on commit 6f76b6fcaa60 ("CodingStyle: Document the exception of not splitting user-visible strings, for grepping") recommendation. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_template.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index 7412d0291ab9..30db39b23804 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -377,8 +377,7 @@ int ima_restore_measurement_list(loff_t size, void *buf)
break;
if (hdr[HDR_TEMPLATE_NAME].len >= MAX_TEMPLATE_NAME_LEN) {
- pr_err("attempting to restore a template name \
- that is too long\n");
+ pr_err("attempting to restore a template name that is too long\n");
ret = -EINVAL;
break;
}
@@ -389,8 +388,8 @@ int ima_restore_measurement_list(loff_t size, void *buf)
template_name[hdr[HDR_TEMPLATE_NAME].len] = 0;
if (strcmp(template_name, "ima") == 0) {
- pr_err("attempting to restore an unsupported \
- template \"%s\" failed\n", template_name);
+ pr_err("attempting to restore an unsupported template \"%s\" failed\n",
+ template_name);
ret = -EINVAL;
break;
}
@@ -410,8 +409,8 @@ int ima_restore_measurement_list(loff_t size, void *buf)
&(template_desc->fields),
&(template_desc->num_fields));
if (ret < 0) {
- pr_err("attempting to restore the template fmt \"%s\" \
- failed\n", template_desc->fmt);
+ pr_err("attempting to restore the template fmt \"%s\" failed\n",
+ template_desc->fmt);
ret = -EINVAL;
break;
}