2020-12-21 03:29:52

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH v2] security: apparmor: delete repeated words in comments

Drop repeated words in comments.
{a, then, to}

Signed-off-by: Randy Dunlap <[email protected]>
Cc: John Johansen <[email protected]>
Cc: [email protected]
Cc: James Morris <[email protected]>
Cc: "Serge E. Hallyn" <[email protected]>
Cc: [email protected]
Reviewed-By: Seth Arnold <[email protected]>
---
v2: rebase

security/apparmor/include/file.h | 2 +-
security/apparmor/path.c | 2 +-
security/apparmor/policy_unpack.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

--- linux-next-20201218.orig/security/apparmor/include/file.h
+++ linux-next-20201218/security/apparmor/include/file.h
@@ -167,7 +167,7 @@ int aa_audit_file(struct aa_profile *pro
* @perms: permission table indexed by the matched state accept entry of @dfa
* @trans: transition table for indexed by named x transitions
*
- * File permission are determined by matching a path against @dfa and then
+ * File permission are determined by matching a path against @dfa and
* then using the value of the accept entry for the matching state as
* an index into @perms. If a named exec transition is required it is
* looked up in the transition table.
--- linux-next-20201218.orig/security/apparmor/path.c
+++ linux-next-20201218/security/apparmor/path.c
@@ -83,7 +83,7 @@ static int disconnect(const struct path
*
* Returns: %0 else error code if path lookup fails
* When no error the path name is returned in @name which points to
- * to a position in @buf
+ * a position in @buf
*/
static int d_namespace_path(const struct path *path, char *buf, char **name,
int flags, const char *disconnected)
--- linux-next-20201218.orig/security/apparmor/policy_unpack.c
+++ linux-next-20201218/security/apparmor/policy_unpack.c
@@ -39,7 +39,7 @@

/*
* The AppArmor interface treats data as a type byte followed by the
- * actual data. The interface has the notion of a a named entry
+ * actual data. The interface has the notion of a named entry
* which has a name (AA_NAME typecode followed by name string) followed by
* the entries typecode and data. Named types allow for optional
* elements and extensions to be added and tested for without breaking


2020-12-21 06:35:23

by John Johansen

[permalink] [raw]
Subject: Re: [PATCH v2] security: apparmor: delete repeated words in comments

On 12/20/20 7:27 PM, Randy Dunlap wrote:
> Drop repeated words in comments.
> {a, then, to}
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: John Johansen <[email protected]>
> Cc: [email protected]
> Cc: James Morris <[email protected]>
> Cc: "Serge E. Hallyn" <[email protected]>
> Cc: [email protected]
> Reviewed-By: Seth Arnold <[email protected]>

Acked-by: John Johansen <[email protected]>

I will pull this into apparmor-next

> ---
> v2: rebase
>
> security/apparmor/include/file.h | 2 +-
> security/apparmor/path.c | 2 +-
> security/apparmor/policy_unpack.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> --- linux-next-20201218.orig/security/apparmor/include/file.h
> +++ linux-next-20201218/security/apparmor/include/file.h
> @@ -167,7 +167,7 @@ int aa_audit_file(struct aa_profile *pro
> * @perms: permission table indexed by the matched state accept entry of @dfa
> * @trans: transition table for indexed by named x transitions
> *
> - * File permission are determined by matching a path against @dfa and then
> + * File permission are determined by matching a path against @dfa and
> * then using the value of the accept entry for the matching state as
> * an index into @perms. If a named exec transition is required it is
> * looked up in the transition table.
> --- linux-next-20201218.orig/security/apparmor/path.c
> +++ linux-next-20201218/security/apparmor/path.c
> @@ -83,7 +83,7 @@ static int disconnect(const struct path
> *
> * Returns: %0 else error code if path lookup fails
> * When no error the path name is returned in @name which points to
> - * to a position in @buf
> + * a position in @buf
> */
> static int d_namespace_path(const struct path *path, char *buf, char **name,
> int flags, const char *disconnected)
> --- linux-next-20201218.orig/security/apparmor/policy_unpack.c
> +++ linux-next-20201218/security/apparmor/policy_unpack.c
> @@ -39,7 +39,7 @@
>
> /*
> * The AppArmor interface treats data as a type byte followed by the
> - * actual data. The interface has the notion of a a named entry
> + * actual data. The interface has the notion of a named entry
> * which has a name (AA_NAME typecode followed by name string) followed by
> * the entries typecode and data. Named types allow for optional
> * elements and extensions to be added and tested for without breaking
>