Skip to content

Commit 25ff0ff

Browse files
gscuijrjohansen
authored andcommitted
apparmor: Fix kernel-doc warnings in apparmor/policy.c
Fix kernel-doc warnings: security/apparmor/policy.c:294: warning: Function parameter or member 'proxy' not described in 'aa_alloc_profile' security/apparmor/policy.c:785: warning: Function parameter or member 'label' not described in 'aa_policy_view_capable' security/apparmor/policy.c:785: warning: Function parameter or member 'ns' not described in 'aa_policy_view_capable' security/apparmor/policy.c:847: warning: Function parameter or member 'ns' not described in 'aa_may_manage_policy' security/apparmor/policy.c:964: warning: Function parameter or member 'hname' not described in '__lookup_replace' security/apparmor/policy.c:964: warning: Function parameter or member 'info' not described in '__lookup_replace' security/apparmor/policy.c:964: warning: Function parameter or member 'noreplace' not described in '__lookup_replace' security/apparmor/policy.c:964: warning: Function parameter or member 'ns' not described in '__lookup_replace' security/apparmor/policy.c:964: warning: Function parameter or member 'p' not described in '__lookup_replace' Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
1 parent 2520d61 commit 25ff0ff

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

security/apparmor/policy.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ void aa_free_profile(struct aa_profile *profile)
285285
/**
286286
* aa_alloc_profile - allocate, initialize and return a new profile
287287
* @hname: name of the profile (NOT NULL)
288+
* @proxy: proxy to use OR null if to allocate a new one
288289
* @gfp: allocation type
289290
*
290291
* Returns: refcount profile or NULL on failure
@@ -774,8 +775,9 @@ static int policy_ns_capable(struct aa_label *label,
774775

775776
/**
776777
* aa_policy_view_capable - check if viewing policy in at @ns is allowed
777-
* label: label that is trying to view policy in ns
778-
* ns: namespace being viewed by @label (may be NULL if @label's ns)
778+
* @label: label that is trying to view policy in ns
779+
* @ns: namespace being viewed by @label (may be NULL if @label's ns)
780+
*
779781
* Returns: true if viewing policy is allowed
780782
*
781783
* If @ns is NULL then the namespace being viewed is assumed to be the
@@ -839,6 +841,7 @@ bool aa_current_policy_admin_capable(struct aa_ns *ns)
839841
/**
840842
* aa_may_manage_policy - can the current task manage policy
841843
* @label: label to check if it can manage policy
844+
* @ns: namespace being managed by @label (may be NULL if @label's ns)
842845
* @mask: contains the policy manipulation operation being done
843846
*
844847
* Returns: 0 if the task is allowed to manipulate policy else error
@@ -950,11 +953,11 @@ static void __replace_profile(struct aa_profile *old, struct aa_profile *new)
950953

951954
/**
952955
* __lookup_replace - lookup replacement information for a profile
953-
* @ns - namespace the lookup occurs in
954-
* @hname - name of profile to lookup
955-
* @noreplace - true if not replacing an existing profile
956-
* @p - Returns: profile to be replaced
957-
* @info - Returns: info string on why lookup failed
956+
* @ns: namespace the lookup occurs in
957+
* @hname: name of profile to lookup
958+
* @noreplace: true if not replacing an existing profile
959+
* @p: Returns - profile to be replaced
960+
* @info: Returns - info string on why lookup failed
958961
*
959962
* Returns: profile to replace (no ref) on success else ptr error
960963
*/

0 commit comments

Comments
 (0)