diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-23 10:16:53 -0700 |
| commit | 1f8d31d189cc6ce1e4b972959fda41e790bb92b8 (patch) | |
| tree | fd3cca12a29319f073773ac55f7d41cc58e2c73f /security/apparmor/lib.c | |
| parent | 3fb5ec06578e4c85d3486b6a73cbeb07960a51ce (diff) | |
| parent | cd4175b11685b11c40e31a03e05084cc212b0649 (diff) | |
| download | lwn-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.tar.gz lwn-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'security/apparmor/lib.c')
| -rw-r--r-- | security/apparmor/lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c index 08ca26bcca77..8818621b5d95 100644 --- a/security/apparmor/lib.c +++ b/security/apparmor/lib.c @@ -211,7 +211,8 @@ void aa_perm_mask_to_str(char *str, const char *chrs, u32 mask) *str = '\0'; } -void aa_audit_perm_names(struct audit_buffer *ab, const char **names, u32 mask) +void aa_audit_perm_names(struct audit_buffer *ab, const char * const *names, + u32 mask) { const char *fmt = "%s"; unsigned int i, perm = 1; @@ -229,7 +230,7 @@ void aa_audit_perm_names(struct audit_buffer *ab, const char **names, u32 mask) } void aa_audit_perm_mask(struct audit_buffer *ab, u32 mask, const char *chrs, - u32 chrsmask, const char **names, u32 namesmask) + u32 chrsmask, const char * const *names, u32 namesmask) { char str[33]; |