v1 --> v2:
Add files to be checked:
include/linux/audit.h
include/uapi/linux/audit.h
Zhen Lei (1):
audit: remove trailing spaces and tabs
include/uapi/linux/audit.h | 4 ++--
kernel/audit.h | 2 +-
kernel/auditsc.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
--
2.25.1
Run the following command to find and remove the trailing spaces and tabs:
sed -r -i 's/[ \t]+$//' <audit_files>
The files to be checked are as follows:
kernel/audit*
include/linux/audit.h
include/uapi/linux/audit.h
Signed-off-by: Zhen Lei <[email protected]>
---
include/uapi/linux/audit.h | 4 ++--
kernel/audit.h | 2 +-
kernel/auditsc.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
index cd2d8279a5e4..daa481729e9b 100644
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@ -48,7 +48,7 @@
* 2500 - 2999 future user space (maybe integrity labels and related events)
*
* Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
- * exclusively user space. 1300-2099 is kernel --> user space
+ * exclusively user space. 1300-2099 is kernel --> user space
* communication.
*/
#define AUDIT_GET 1000 /* Get status */
@@ -78,7 +78,7 @@
#define AUDIT_LAST_USER_MSG 1199
#define AUDIT_FIRST_USER_MSG2 2100 /* More user space messages */
#define AUDIT_LAST_USER_MSG2 2999
-
+
#define AUDIT_DAEMON_START 1200 /* Daemon startup record */
#define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */
#define AUDIT_DAEMON_ABORT 1202 /* Daemon error stop record */
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
On 2021-06-09 10:27, Zhen Lei wrote:
> Run the following command to find and remove the trailing spaces and tabs:
>
> sed -r -i 's/[ \t]+$//' <audit_files>
>
> The files to be checked are as follows:
> kernel/audit*
> include/linux/audit.h
> include/uapi/linux/audit.h
>
> Signed-off-by: Zhen Lei <[email protected]>
Acked-by: Richard Guy Briggs <[email protected]>
> ---
> include/uapi/linux/audit.h | 4 ++--
> kernel/audit.h | 2 +-
> kernel/auditsc.c | 8 ++++----
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> index cd2d8279a5e4..daa481729e9b 100644
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@ -48,7 +48,7 @@
> * 2500 - 2999 future user space (maybe integrity labels and related events)
> *
> * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
> - * exclusively user space. 1300-2099 is kernel --> user space
> + * exclusively user space. 1300-2099 is kernel --> user space
> * communication.
> */
> #define AUDIT_GET 1000 /* Get status */
> @@ -78,7 +78,7 @@
> #define AUDIT_LAST_USER_MSG 1199
> #define AUDIT_FIRST_USER_MSG2 2100 /* More user space messages */
> #define AUDIT_LAST_USER_MSG2 2999
> -
> +
> #define AUDIT_DAEMON_START 1200 /* Daemon startup record */
> #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */
> #define AUDIT_DAEMON_ABORT 1202 /* Daemon error stop record */
> 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
>
>
>
> --
> Linux-audit mailing list
> [email protected]
> https://listman.redhat.com/mailman/listinfo/linux-audit
- 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
On Tue, Jun 8, 2021 at 10:27 PM Zhen Lei <[email protected]> wrote:
>
> Run the following command to find and remove the trailing spaces and tabs:
>
> sed -r -i 's/[ \t]+$//' <audit_files>
>
> The files to be checked are as follows:
> kernel/audit*
> include/linux/audit.h
> include/uapi/linux/audit.h
>
> Signed-off-by: Zhen Lei <[email protected]>
> ---
> include/uapi/linux/audit.h | 4 ++--
> kernel/audit.h | 2 +-
> kernel/auditsc.c | 8 ++++----
> 3 files changed, 7 insertions(+), 7 deletions(-)
Merged into audit/next.
--
paul moore
http://www.paul-moore.com