diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2015-05-29 01:44:29 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-06-09 20:43:50 +0300 |
| commit | ce8d4a6371aa570bbe7ecaf618868cc4f6d5b437 (patch) | |
| tree | 976cc5f9b205891610a7da1f87287301f9634658 /fs/omfs | |
| parent | 08fb8020b96c0dd8d6199b48c783d9ecb51d1956 (diff) | |
| download | linux-ce8d4a6371aa570bbe7ecaf618868cc4f6d5b437.tar.xz | |
fs, omfs: add NULL terminator in the end up the token list
[ Upstream commit dcbff39da3d815f08750552fdd04f96b51751129 ]
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/omfs')
| -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 138321b0c6c2..70d4191cf33d 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c @@ -359,7 +359,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 = { @@ -368,6 +368,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) |