2021-06-08 07:56:18

by Zhen Lei

Subject: [PATCH 1/1] audit: remove trailing spaces and tabs

Run the following command to find and remove the trailing spaces and tabs:

sed -r -i 's/[ \t]+$//' kernel/audit*

Signed-off-by: Zhen Lei <[email protected]>
---
kernel/audit.h | 2 +-
kernel/auditsc.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/audit.h b/kernel/audit.h
index 1522e100fd17..cab3e2652dab 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* audit -- definition of audit_context structure and supporting types
+/* audit -- definition of audit_context structure and supporting types
*
* Copyright 2003-2004 Red Hat, Inc.
* Copyright 2005 Hewlett-Packard Development Company, L.P.
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 0a9a1569f1ea..679a43fd342a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -343,13 +343,13 @@ static int audit_compare_uid(kuid_t uid,
{
struct audit_names *n;
int rc;
-
+
if (name) {
rc = audit_uid_comparator(uid, f->op, name->uid);
if (rc)
return rc;
}
-
+
if (ctx) {
list_for_each_entry(n, &ctx->names_list, list) {
rc = audit_uid_comparator(uid, f->op, n->uid);
@@ -367,13 +367,13 @@ static int audit_compare_gid(kgid_t gid,
{
struct audit_names *n;
int rc;
-
+
if (name) {
rc = audit_gid_comparator(gid, f->op, name->gid);
if (rc)
return rc;
}
-
+
if (ctx) {
list_for_each_entry(n, &ctx->names_list, list) {
rc = audit_gid_comparator(gid, f->op, n->gid);
--
2.25.1

2021-06-09 02:24:58

by Richard Guy Briggs

Subject: Re: [PATCH 1/1] audit: remove trailing spaces and tabs

On 2021-06-08 15:54, Zhen Lei wrote:
> Run the following command to find and remove the trailing spaces and tabs:
>
> sed -r -i 's/[ \t]+$//' kernel/audit*

The api header include/uapi/linux/audit.h should probably be included.

> Signed-off-by: Zhen Lei <[email protected]>
> ---
> kernel/audit.h | 2 +-
> kernel/auditsc.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/audit.h b/kernel/audit.h
> index 1522e100fd17..cab3e2652dab 100644
> --- a/kernel/audit.h
> +++ b/kernel/audit.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-or-later */
> -/* audit -- definition of audit_context structure and supporting types
> +/* audit -- definition of audit_context structure and supporting types
> *
> * Copyright 2003-2004 Red Hat, Inc.
> * Copyright 2005 Hewlett-Packard Development Company, L.P.
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 0a9a1569f1ea..679a43fd342a 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -343,13 +343,13 @@ static int audit_compare_uid(kuid_t uid,
> {
> struct audit_names *n;
> int rc;
> -
> +
> if (name) {
> rc = audit_uid_comparator(uid, f->op, name->uid);
> if (rc)
> return rc;
> }
> -
> +
> if (ctx) {
> list_for_each_entry(n, &ctx->names_list, list) {
> rc = audit_uid_comparator(uid, f->op, n->uid);
> @@ -367,13 +367,13 @@ static int audit_compare_gid(kgid_t gid,
> {
> struct audit_names *n;
> int rc;
> -
> +
> if (name) {
> rc = audit_gid_comparator(gid, f->op, name->gid);
> if (rc)
> return rc;
> }
> -
> +
> if (ctx) {
> list_for_each_entry(n, &ctx->names_list, list) {
> rc = audit_gid_comparator(gid, f->op, n->gid);
> --
> 2.25.1

- RGB

--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems
Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635

2021-06-09 17:03:37

by Zhen Lei

Subject: Re: [PATCH 1/1] audit: remove trailing spaces and tabs

On 2021/6/8 23:17, Richard Guy Briggs wrote:
> On 2021-06-08 15:54, Zhen Lei wrote:
>> Run the following command to find and remove the trailing spaces and tabs:
>>
>> sed -r -i 's/[ \t]+$//' kernel/audit*
>
> The api header include/uapi/linux/audit.h should probably be included.

OK, I will included it in v2.

>
>> Signed-off-by: Zhen Lei <[email protected]>
>> ---
>> kernel/audit.h | 2 +-
>> kernel/auditsc.c | 8 ++++----
>> 2 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/kernel/audit.h b/kernel/audit.h
>> index 1522e100fd17..cab3e2652dab 100644
>> --- a/kernel/audit.h
>> +++ b/kernel/audit.h
>> @@ -1,5 +1,5 @@
>> /* SPDX-License-Identifier: GPL-2.0-or-later */
>> -/* audit -- definition of audit_context structure and supporting types
>> +/* audit -- definition of audit_context structure and supporting types
>> *
>> * Copyright 2003-2004 Red Hat, Inc.
>> * Copyright 2005 Hewlett-Packard Development Company, L.P.
>> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
>> index 0a9a1569f1ea..679a43fd342a 100644
>> --- a/kernel/auditsc.c
>> +++ b/kernel/auditsc.c
>> @@ -343,13 +343,13 @@ static int audit_compare_uid(kuid_t uid,
>> {
>> struct audit_names *n;
>> int rc;
>> -
>> +
>> if (name) {
>> rc = audit_uid_comparator(uid, f->op, name->uid);
>> if (rc)
>> return rc;
>> }
>> -
>> +
>> if (ctx) {
>> list_for_each_entry(n, &ctx->names_list, list) {
>> rc = audit_uid_comparator(uid, f->op, n->uid);
>> @@ -367,13 +367,13 @@ static int audit_compare_gid(kgid_t gid,
>> {
>> struct audit_names *n;
>> int rc;
>> -
>> +
>> if (name) {
>> rc = audit_gid_comparator(gid, f->op, name->gid);
>> if (rc)
>> return rc;
>> }
>> -
>> +
>> if (ctx) {
>> list_for_each_entry(n, &ctx->names_list, list) {
>> rc = audit_gid_comparator(gid, f->op, n->gid);
>> --
>> 2.25.1
>
> - RGB
>
> --
> Richard Guy Briggs <[email protected]>
> Sr. S/W Engineer, Kernel Security, Base Operating Systems
> Remote, Ottawa, Red Hat Canada
> IRC: rgb, SunRaycer
> Voice: +1.647.777.2635, Internal: (81) 32635
>
>
> .
>