Messages in this thread Patch in this message | | | Date | Sun, 13 Sep 2015 00:56:32 +0200 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 26/62] fs, omfs: add NULL terminator in the end up the token list |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
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: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit a5045e0fee1a7b2cf132afb94977d4c8d781bd04)
Signed-off-by: Willy Tarreau <w@1wt.eu> --- 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 f3b7c15..66c37eb 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) -- 1.7.12.2.21.g234cd45.dirty
| |