Skip to content

Commit e18573d

Browse files
gscuijrjohansen
authored andcommitted
apparmor: Fix kernel-doc warnings in apparmor/label.c
Fix kernel-doc warnings: security/apparmor/label.c:166: warning: Excess function parameter 'n' description in 'vec_cmp' security/apparmor/label.c:166: warning: Excess function parameter 'vec' description in 'vec_cmp' security/apparmor/label.c:166: warning: Function parameter or member 'an' not described in 'vec_cmp' security/apparmor/label.c:166: warning: Function parameter or member 'bn' not described in 'vec_cmp' security/apparmor/label.c:166: warning: Function parameter or member 'b' not described in 'vec_cmp' security/apparmor/label.c:2051: warning: Function parameter or member 'label' not described in '__label_update' security/apparmor/label.c:266: warning: Function parameter or member 'flags' not described in 'aa_vec_unique' security/apparmor/label.c:594: warning: Excess function parameter 'l' description in '__label_remove' security/apparmor/label.c:594: warning: Function parameter or member 'label' not described in '__label_remove' security/apparmor/label.c:929: warning: Function parameter or member 'label' not described in 'aa_label_insert' security/apparmor/label.c:929: warning: Function parameter or member 'ls' not described in 'aa_label_insert' security/apparmor/label.c:1221: warning: Excess function parameter 'ls' description in 'aa_label_merge' security/apparmor/label.c:1302: warning: Excess function parameter 'start' description in 'label_compound_match' security/apparmor/label.c:1302: warning: Function parameter or member 'rules' not described in 'label_compound_match' security/apparmor/label.c:1302: warning: Function parameter or member 'state' not described in 'label_compound_match' security/apparmor/label.c:2051: warning: Function parameter or member 'label' not described in '__label_update' Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
1 parent 3175df8 commit e18573d

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

security/apparmor/label.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,10 @@ static int profile_cmp(struct aa_profile *a, struct aa_profile *b)
154154

155155
/**
156156
* vec_cmp - label comparison for set ordering
157-
* @a: label to compare (NOT NULL)
158-
* @vec: vector of profiles to compare (NOT NULL)
159-
* @n: length of @vec
157+
* @a: aa_profile to compare (NOT NULL)
158+
* @an: length of @a
159+
* @b: aa_profile to compare (NOT NULL)
160+
* @bn: length of @b
160161
*
161162
* Returns: <0 if a < vec
162163
* ==0 if a == vec
@@ -256,6 +257,7 @@ static inline int unique(struct aa_profile **vec, int n)
256257
* aa_vec_unique - canonical sort and unique a list of profiles
257258
* @n: number of refcounted profiles in the list (@n > 0)
258259
* @vec: list of profiles to sort and merge
260+
* @flags: null terminator flags of @vec
259261
*
260262
* Returns: the number of duplicates eliminated == references put
261263
*
@@ -584,7 +586,7 @@ bool aa_label_is_unconfined_subset(struct aa_label *set, struct aa_label *sub)
584586

585587
/**
586588
* __label_remove - remove @label from the label set
587-
* @l: label to remove
589+
* @label: label to remove
588590
* @new: label to redirect to
589591
*
590592
* Requires: labels_set(@label)->lock write_lock
@@ -917,8 +919,8 @@ struct aa_label *aa_label_find(struct aa_label *label)
917919

918920
/**
919921
* aa_label_insert - insert label @label into @ls or return existing label
920-
* @ls - labelset to insert @label into
921-
* @label - label to insert
922+
* @ls: labelset to insert @label into
923+
* @label: label to insert
922924
*
923925
* Requires: caller to hold a valid ref on @label
924926
*
@@ -1204,7 +1206,6 @@ struct aa_label *aa_label_find_merge(struct aa_label *a, struct aa_label *b)
12041206

12051207
/**
12061208
* aa_label_merge - attempt to insert new merged label of @a and @b
1207-
* @ls: set of labels to insert label into (NOT NULL)
12081209
* @a: label to merge with @b (NOT NULL)
12091210
* @b: label to merge with @a (NOT NULL)
12101211
* @gfp: memory allocation type
@@ -1282,8 +1283,9 @@ static inline aa_state_t match_component(struct aa_profile *profile,
12821283
/**
12831284
* label_compound_match - find perms for full compound label
12841285
* @profile: profile to find perms for
1286+
* @rules: ruleset to search
12851287
* @label: label to check access permissions for
1286-
* @start: state to start match in
1288+
* @state: state to start match in
12871289
* @subns: whether to do permission checks on components in a subns
12881290
* @request: permissions to request
12891291
* @perms: perms struct to set
@@ -2037,7 +2039,7 @@ static struct aa_label *labelset_next_stale(struct aa_labelset *ls)
20372039

20382040
/**
20392041
* __label_update - insert updated version of @label into labelset
2040-
* @label - the label to update/replace
2042+
* @label: the label to update/replace
20412043
*
20422044
* Returns: new label that is up to date
20432045
* else NULL on failure

0 commit comments

Comments
 (0)