diff options
| author | James Morris <james.morris@microsoft.com> | 2018-09-04 20:35:54 +0200 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-09-04 20:35:54 +0200 |
| commit | e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce (patch) | |
| tree | f956a5ea0e83fc6d0df3e64681e7bbc1f201f3ee /security/apparmor/file.c | |
| parent | security/capabilities: remove check for -EINVAL (diff) | |
| parent | Linux 4.19-rc2 (diff) | |
| download | linux-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.tar.xz linux-e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce.zip | |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
Diffstat (limited to 'security/apparmor/file.c')
| -rw-r--r-- | security/apparmor/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/apparmor/file.c b/security/apparmor/file.c index 224b2fef93ca..4285943f7260 100644 --- a/security/apparmor/file.c +++ b/security/apparmor/file.c @@ -47,7 +47,8 @@ static void audit_file_mask(struct audit_buffer *ab, u32 mask) { char str[10]; - aa_perm_mask_to_str(str, aa_file_perm_chrs, map_mask_to_chr_mask(mask)); + aa_perm_mask_to_str(str, sizeof(str), aa_file_perm_chrs, + map_mask_to_chr_mask(mask)); audit_log_string(ab, str); } |