diff options
| author | Tyler Hicks <tyhicks@canonical.com> | 2018-07-06 07:25:00 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-07-20 01:24:43 +0200 |
| commit | 7f3ebcf2b1395e0248e56146041e1e5625fd2f23 (patch) | |
| tree | 51d693e57cc5734aee692b1cebab08acd1aab511 /security/apparmor/file.c | |
| parent | Merge tag 'pci-v4.18-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-7f3ebcf2b1395e0248e56146041e1e5625fd2f23.tar.xz linux-7f3ebcf2b1395e0248e56146041e1e5625fd2f23.zip | |
apparmor: Check buffer bounds when mapping permissions mask
Don't read past the end of the buffer containing permissions
characters or write past the end of the destination string.
Detected by CoverityScan CID#1415361, 1415376 ("Out-of-bounds access")
Fixes: e53cfe6c7caa ("apparmor: rework perm mapping to a slightly broader set")
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
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); } |