diff options
| author | John Johansen <john.johansen@canonical.com> | 2018-06-05 04:44:59 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-06-07 10:50:49 +0200 |
| commit | a4c3f89c9b5a9fab5a8e4ea05399acd6e23072df (patch) | |
| tree | 7a92b037adce16071b0ca0207115b7d8f434c5c6 /security/apparmor/include | |
| parent | apparmor: Use an IDR to allocate apparmor secids (diff) | |
| download | linux-a4c3f89c9b5a9fab5a8e4ea05399acd6e23072df.tar.xz linux-a4c3f89c9b5a9fab5a8e4ea05399acd6e23072df.zip | |
apparmor: fixup secid map conversion to using IDR
The IDR conversion did not handle an error case for when allocating a
mapping fails, and it did not ensure that mappings did not allocate or
use a 0 value, which is used as an invalid secid. Which is used when a
mapping fails.
Fixes: 3ae7eb49a2be ("apparmor: Use an IDR to allocate apparmor secids")
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/include')
| -rw-r--r-- | security/apparmor/include/secid.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/apparmor/include/secid.h b/security/apparmor/include/secid.h index 686de8e50a79..dee6fa3b6081 100644 --- a/security/apparmor/include/secid.h +++ b/security/apparmor/include/secid.h @@ -28,8 +28,10 @@ int apparmor_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid); void apparmor_release_secctx(char *secdata, u32 seclen); -u32 aa_alloc_secid(struct aa_label *label, gfp_t gfp); +int aa_alloc_secid(struct aa_label *label, gfp_t gfp); void aa_free_secid(u32 secid); void aa_secid_update(u32 secid, struct aa_label *label); +void aa_secids_init(void); + #endif /* __AA_SECID_H */ |