From d2fe16e94cc30c0af5327d5a673dd1761b9edfae Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Tue, 8 Aug 2023 13:12:19 -0700
Subject: [PATCH] apparmor: fixup return comments for kernel doc cleanups by
Gaosheng Cui
[PATCH -next 05/11] apparmor: Fix kernel-doc warnings in apparmor/label.c
missed updating the Returns comment for the new parameter names
[PATCH -next 05/11] apparmor: Fix kernel-doc warnings in apparmor/label.c
Added the @size parameter comment without mentioning it is a return
value.
Signed-off-by: John Johansen <john.johansen@canonical.com>
---
security/apparmor/label.c | 6 +++---
security/apparmor/policy_compat.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index ce9c39102a93..8a74e89b05f4 100644
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -159,9 +159,9 @@ static int profile_cmp(struct aa_profile *a, struct aa_profile *b)
* @b: aa_profile to compare (NOT NULL)
* @bn: length of @b
*
- * Returns: <0 if a < vec
- * ==0 if a == vec
- * >0 if a > vec
+ * Returns: <0 if @a < @b
+ * ==0 if @a == @b
+ * >0 if @a > @b
*/
static int vec_cmp(struct aa_profile **a, int an, struct aa_profile **b, int bn)
{
diff --git a/security/apparmor/policy_compat.c b/security/apparmor/policy_compat.c
index 18e4ddccf623..423227670e68 100644
--- a/security/apparmor/policy_compat.c
+++ b/security/apparmor/policy_compat.c
@@ -143,7 +143,7 @@ static struct aa_perms compute_fperms_other(struct aa_dfa *dfa,
* compute_fperms - convert dfa compressed perms to internal perms and store
* them so they can be retrieved later.
* @dfa: a dfa using fperms to remap to internal permissions
- * @size: the permission table size
+ * @size: Returns the permission table size
*
* Returns: remapped perm table
*/
--
GitLab