Patch "fs, omfs: add NULL terminator in the end up the token list" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

fs, omfs: add NULL terminator in the end up the token list

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
fs-omfs-add-null-terminator-in-the-end-up-the-token-list.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Sasha Levin <[email protected]>
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 <[email protected]>

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.

---
 fs/omfs/inode.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/fs-omfs-add-null-terminator-in-the-end-up-the-token-list.patch