Commit 25ff0ff2 authored by Gaosheng Cui's avatar Gaosheng Cui Committed by John Johansen
Browse files

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: default avatarGaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 2520d61c

security/apparmor/policy.c

+10 −7
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ void aa_free_profile(struct aa_profile *profile) 
/**

 * aa_alloc_profile - allocate, initialize and return a new profile

 * @hname: name of the profile  (NOT NULL)

 * @proxy: proxy to use OR null if to allocate a new one

 * @gfp: allocation type

 *

 * Returns: refcount profile or NULL on failure
@@ -774,8 +775,9 @@ static int policy_ns_capable(struct aa_label *label, 


/**

 * aa_policy_view_capable - check if viewing policy in at @ns is allowed

 * label: label that is trying to view policy in ns

 * ns: namespace being viewed by @label (may be NULL if @label's ns)

 * @label: label that is trying to view policy in ns

 * @ns: namespace being viewed by @label (may be NULL if @label's ns)

 *

 * Returns: true if viewing policy is allowed

 *

 * 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) 
/**

 * aa_may_manage_policy - can the current task manage policy

 * @label: label to check if it can manage policy

 * @ns: namespace being managed by @label (may be NULL if @label's ns)

 * @mask: contains the policy manipulation operation being done

 *

 * 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) 


/**

 * __lookup_replace - lookup replacement information for a profile

 * @ns - namespace the lookup occurs in

 * @hname - name of profile to lookup

 * @noreplace - true if not replacing an existing profile

 * @p - Returns: profile to be replaced

 * @info - Returns: info string on why lookup failed

 * @ns: namespace the lookup occurs in

 * @hname: name of profile to lookup

 * @noreplace: true if not replacing an existing profile

 * @p: Returns - profile to be replaced

 * @info: Returns - info string on why lookup failed

 *

 * Returns: profile to replace (no ref) on success else ptr error

 */