lkml.org 
[lkml]   [2015]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 114/146] fs, omfs: add NULL terminator in the end up the token list
    Date
    From: Sasha Levin <sasha.levin@oracle.com>

    3.4.109-rc1 review patch. If anyone has any objections, please let me know.

    ------------------


    commit dcbff39da3d815f08750552fdd04f96b51751129 upstream.

    match_token() expects a NULL terminator at the end of the token list so
    that it would know where to stop. Not having one causes it to overrun
    to invalid memory.

    In practice, passing a mount option that omfs didn't recognize would
    sometimes panic the system.

    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    fs/omfs/inode.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
    index dbc8422..798dedc 100644
    --- a/fs/omfs/inode.c
    +++ b/fs/omfs/inode.c
    @@ -361,7 +361,7 @@ nomem:
    }

    enum {
    - Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask
    + Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask, Opt_err
    };

    static const match_table_t tokens = {
    @@ -370,6 +370,7 @@ static const match_table_t tokens = {
    {Opt_umask, "umask=%o"},
    {Opt_dmask, "dmask=%o"},
    {Opt_fmask, "fmask=%o"},
    + {Opt_err, NULL},
    };

    static int parse_options(char *options, struct omfs_sb_info *sbi)
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-15 11:41    [W:7.859 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site