lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 215/235] apparmor: add missing id bounds check on dfa verification
    Date
    From: John Johansen <john.johansen@canonical.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 15756178c6a65b261a080e21af4766f59cafc112 upstream.

    Signed-off-by: John Johansen <john.johansen@canonical.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    security/apparmor/include/match.h | 1 +
    security/apparmor/match.c | 2 ++
    2 files changed, 3 insertions(+)

    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);
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 12:23    [W:4.022 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site