| From dcbff39da3d815f08750552fdd04f96b51751129 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sasha.levin@oracle.com> |
| Date: Thu, 28 May 2015 15:44:29 -0700 |
| Subject: fs, omfs: add NULL terminator in the end up the token list |
| |
| From: Sasha Levin <sasha.levin@oracle.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/omfs/inode.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- 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) |
