diff options
| author |   John Johansen <john.johansen@canonical.com> | 2017-06-02 13:50:22 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2017-06-10 17:11:31 -0700 |
| commit | ae3b31653691b9c5b572b99596de3dfcc8f05006 (patch) | |
| tree | 1f584ba660eee1f2098ca50001f27d61f7142436 /security/apparmor | |
| parent | apparmor: provide information about path buffer size at boot (diff) | |
| download | linux-dev-ae3b31653691b9c5b572b99596de3dfcc8f05006.tar.xz linux-dev-ae3b31653691b9c5b572b99596de3dfcc8f05006.zip | |
apparmor: cleanup __find_child()
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/policy.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index 65e98d0491f4..0a99e5324da0 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -397,33 +397,33 @@ fail: /* TODO: profile accounting - setup in remove */ /** - * __find_child - find a profile on @head list with a name matching @name + * __strn_find_child - find a profile on @head list using substring of @name * @head: list to search (NOT NULL) * @name: name of profile (NOT NULL) + * @len: length of @name substring to match * * Requires: rcu_read_lock be held * * Returns: unrefcounted profile ptr, or NULL if not found */ -static struct aa_profile *__find_child(struct list_head *head, const char *name) +static struct aa_profile *__strn_find_child(struct list_head *head, + const char *name, int len) { - return (struct aa_profile *)__policy_find(head, name); + return (struct aa_profile *)__policy_strn_find(head, name, len); } /** - * __strn_find_child - find a profile on @head list using substring of @name + * __find_child - find a profile on @head list with a name matching @name * @head: list to search (NOT NULL) * @name: name of profile (NOT NULL) - * @len: length of @name substring to match * * Requires: rcu_read_lock be held * * Returns: unrefcounted profile ptr, or NULL if not found */ -static struct aa_profile *__strn_find_child(struct list_head *head, - const char *name, int len) +static struct aa_profile *__find_child(struct list_head *head, const char *name) { - return (struct aa_profile *)__policy_strn_find(head, name, len); + return __strn_find_child(head, name, strlen(name)); } /** |