diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2015-05-28 15:44:29 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-09-18 13:52:03 +0200 |
| commit | 7366056a9f1943d924cf78f4e4924d6bbe06b607 (patch) | |
| tree | e62443ed80201e7b78e6c81bf30dc8fa4f6dfe27 /fs | |
| parent | c38b1588994eb29499032b5bd58dd28a6d0097d0 (diff) | |
fs, omfs: add NULL terminator in the end up the token list
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: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit a5045e0fee1a7b2cf132afb94977d4c8d781bd04)
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/omfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index f3b7c1541f3a..66c37eb89e0c 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c @@ -347,7 +347,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 = { @@ -356,6 +356,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) |