From: Joe Perches <joe@perches.com>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: James Morris <james.l.morris@oracle.com>,
"Serge E. Hallyn" <serge@hallyn.com>,
linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] ima: Fix line continuation format
Date: Thu, 16 Nov 2017 07:27:29 -0800 [thread overview]
Message-ID: <ea357947f2cbac6cd7ace62c92831d0d6d403ea8.1510845910.git.joe@perches.com> (raw)
In-Reply-To: <cover.1510845910.git.joe@perches.com>
Line continuations with excess spacing causes unexpected output.
Signed-off-by: Joe Perches <joe@perches.com>
---
security/integrity/ima/ima_template.c | 11 +++++------
1 file 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;
}
--
2.15.0
next prev parent reply other threads:[~2017-11-16 15:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 15:27 [PATCH 0/4] treewide: Fix line continuation formats Joe Perches
2017-11-16 15:27 ` [PATCH 1/4] rk3399_dmc: Fix line continuation format Joe Perches
2017-11-22 5:13 ` Chanwoo Choi
2017-11-22 10:41 ` Joe Perches
[not found] ` <CGME20171116152742epcas2p22b17887a4d7f2adcd3beb414988dbce3@epcms1p1>
2017-11-23 1:21 ` MyungJoo Ham
2017-11-23 1:45 ` Chanwoo Choi
2017-11-23 2:07 ` Joe Perches
2017-11-23 2:12 ` Chanwoo Choi
2017-11-23 2:18 ` Joe Perches
2017-11-23 2:23 ` Chanwoo Choi
2017-11-23 2:29 ` Joe Perches
2017-11-23 2:35 ` Chanwoo Choi
2017-11-23 2:38 ` Joe Perches
2017-11-16 15:27 ` [PATCH 2/4] drm: amd: Fix line continuation formats Joe Perches
2017-11-16 15:38 ` Harry Wentland
2017-11-16 15:50 ` Joe Perches
2017-11-17 19:52 ` Alex Deucher
2017-11-16 15:27 ` [PATCH 3/4] [media] dibx000_common: Fix line continuation format Joe Perches
2017-11-16 15:27 ` Joe Perches [this message]
2017-11-16 17:11 ` [PATCH 0/4] treewide: Fix line continuation formats Mimi Zohar
2017-11-16 17:17 ` Joe Perches
2017-11-16 19:35 ` Mimi Zohar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea357947f2cbac6cd7ace62c92831d0d6d403ea8.1510845910.git.joe@perches.com \
--to=joe@perches.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=james.l.morris@oracle.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®