diff options
| author | John Johansen <john.johansen@canonical.com> | 2016-06-02 12:37:02 +0300 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2016-07-12 18:43:10 +0300 |
| commit | 15756178c6a65b261a080e21af4766f59cafc112 (patch) | |
| tree | 98fabd29ae0f62c2f3b99ae0e57ba5d253e4bf82 /security/apparmor | |
| parent | ff118479a76dbece9ae1c65c7c6a3ebe9cfa73e0 (diff) | |
| download | linux-15756178c6a65b261a080e21af4766f59cafc112.tar.xz | |
apparmor: add missing id bounds check on dfa verification
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/include/match.h | 1 | ||||
| -rw-r--r-- | security/apparmor/match.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h index 001c43aa0406..a1c04fe86790 100644 --- a/security/apparmor/include/match.h +++ b/security/apparmor/include/match.h @@ -62,6 +62,7 @@ struct table_set_header { #define YYTD_ID_ACCEPT2 6 #define YYTD_ID_NXT 7 #define YYTD_ID_TSIZE 8 +#define YYTD_ID_MAX 8 #define YYTD_DATA8 1 #define YYTD_DATA16 2 diff --git a/security/apparmor/match.c b/security/apparmor/match.c index 727eb4200d5c..f9f57c626f54 100644 --- a/security/apparmor/match.c +++ b/security/apparmor/match.c @@ -47,6 +47,8 @@ static struct table_header *unpack_table(char *blob, size_t bsize) * it every time we use td_id as an index */ th.td_id = be16_to_cpu(*(u16 *) (blob)) - 1; + if (th.td_id > YYTD_ID_MAX) + goto out; th.td_flags = be16_to_cpu(*(u16 *) (blob + 2)); th.td_lolen = be32_to_cpu(*(u32 *) (blob + 8)); blob += sizeof(struct table_header); |