Fix function name in security/apparmor/label.c, policy.c, procattr.c
kernel-doc comment to remove some warnings found by clang(make W=1 LLVM=1).
security/apparmor/label.c:499: warning: expecting prototype for
aa_label_next_not_in_set(). Prototype was for
__aa_label_next_not_in_set() instead
security/apparmor/label.c:2147: warning: expecting prototype for
__aa_labelset_udate_subtree(). Prototype was for
__aa_labelset_update_subtree() instead
security/apparmor/policy.c:434: warning: expecting prototype for
aa_lookup_profile(). Prototype was for aa_lookupn_profile() instead
security/apparmor/procattr.c:101: warning: expecting prototype for
aa_setprocattr_chagnehat(). Prototype was for aa_setprocattr_changehat()
instead
Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
security/apparmor/label.c | 4 ++--
security/apparmor/policy.c | 2 +-
security/apparmor/procattr.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 0b0265d..e8ada60 100644
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -485,7 +485,7 @@ int aa_label_next_confined(struct aa_label *label, int i)
}
/**
- * aa_label_next_not_in_set - return the next profile of @sub not in @set
+ * __aa_label_next_not_in_set - return the next profile of @sub not in @set
* @I: label iterator
* @set: label to test against
* @sub: label to if is subset of @set
@@ -2136,7 +2136,7 @@ static void __labelset_update(struct aa_ns *ns)
}
/**
- * __aa_labelset_udate_subtree - update all labels with a stale component
+ * __aa_labelset_update_subtree - update all labels with a stale component
* @ns: ns to start update at (NOT NULL)
*
* Requires: @ns lock be held
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index b0cbc4906..8357f4a 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -422,7 +422,7 @@ static struct aa_profile *__lookup_profile(struct aa_policy *base,
}
/**
- * aa_lookup_profile - find a profile by its full or partial name
+ * aa_lookupn_profile - find a profile by its full or partial name
* @ns: the namespace to start from (NOT NULL)
* @hname: name to do lookup on. Does not contain namespace prefix (NOT NULL)
* @n: size of @hname
diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c
index fde332e..86ad26e 100644
--- a/security/apparmor/procattr.c
+++ b/security/apparmor/procattr.c
@@ -90,7 +90,7 @@ static char *split_token_from_name(const char *op, char *args, u64 *token)
}
/**
- * aa_setprocattr_chagnehat - handle procattr interface to change_hat
+ * aa_setprocattr_changehat - handle procattr interface to change_hat
* @args: args received from writing to /proc/<pid>/attr/current (NOT NULL)
* @size: size of the args
* @flags: set of flags governing behavior
--
1.8.3.1
On 11/16/21 11:37 PM, Yang Li wrote:
> Fix function name in security/apparmor/label.c, policy.c, procattr.c
> kernel-doc comment to remove some warnings found by clang(make W=1 LLVM=1).
>
> security/apparmor/label.c:499: warning: expecting prototype for
> aa_label_next_not_in_set(). Prototype was for
> __aa_label_next_not_in_set() instead
> security/apparmor/label.c:2147: warning: expecting prototype for
> __aa_labelset_udate_subtree(). Prototype was for
> __aa_labelset_update_subtree() instead
>
> security/apparmor/policy.c:434: warning: expecting prototype for
> aa_lookup_profile(). Prototype was for aa_lookupn_profile() instead
>
> security/apparmor/procattr.c:101: warning: expecting prototype for
> aa_setprocattr_chagnehat(). Prototype was for aa_setprocattr_changehat()
> instead
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>
Acked-by: John Johansen <[email protected]>
I have pulled this into my tree
> ---
> security/apparmor/label.c | 4 ++--
> security/apparmor/policy.c | 2 +-
> security/apparmor/procattr.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/security/apparmor/label.c b/security/apparmor/label.c
> index 0b0265d..e8ada60 100644
> --- a/security/apparmor/label.c
> +++ b/security/apparmor/label.c
> @@ -485,7 +485,7 @@ int aa_label_next_confined(struct aa_label *label, int i)
> }
>
> /**
> - * aa_label_next_not_in_set - return the next profile of @sub not in @set
> + * __aa_label_next_not_in_set - return the next profile of @sub not in @set
> * @I: label iterator
> * @set: label to test against
> * @sub: label to if is subset of @set
> @@ -2136,7 +2136,7 @@ static void __labelset_update(struct aa_ns *ns)
> }
>
> /**
> - * __aa_labelset_udate_subtree - update all labels with a stale component
> + * __aa_labelset_update_subtree - update all labels with a stale component
> * @ns: ns to start update at (NOT NULL)
> *
> * Requires: @ns lock be held
> diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
> index b0cbc4906..8357f4a 100644
> --- a/security/apparmor/policy.c
> +++ b/security/apparmor/policy.c
> @@ -422,7 +422,7 @@ static struct aa_profile *__lookup_profile(struct aa_policy *base,
> }
>
> /**
> - * aa_lookup_profile - find a profile by its full or partial name
> + * aa_lookupn_profile - find a profile by its full or partial name
> * @ns: the namespace to start from (NOT NULL)
> * @hname: name to do lookup on. Does not contain namespace prefix (NOT NULL)
> * @n: size of @hname
> diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c
> index fde332e..86ad26e 100644
> --- a/security/apparmor/procattr.c
> +++ b/security/apparmor/procattr.c
> @@ -90,7 +90,7 @@ static char *split_token_from_name(const char *op, char *args, u64 *token)
> }
>
> /**
> - * aa_setprocattr_chagnehat - handle procattr interface to change_hat
> + * aa_setprocattr_changehat - handle procattr interface to change_hat
> * @args: args received from writing to /proc/<pid>/attr/current (NOT NULL)
> * @size: size of the args
> * @flags: set of flags governing behavior
>