From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Copeland Subject: [PATCH 1/4] fs, omfs: add NULL terminator in the end up the token list Date: Mon, 18 May 2015 07:34:35 -0400 Message-ID: <1431948878-3756-2-git-send-email-me@bobcopeland.com> References: <1431948878-3756-1-git-send-email-me@bobcopeland.com> Cc: linux-fsdevel@vger.kernel.org, Sasha Levin , stable@vger.kernel.org, Bob Copeland To: akpm@linux-foundation.org Return-path: Received: from mail-ig0-f172.google.com ([209.85.213.172]:37169 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753768AbbERLhZ (ORCPT ); Mon, 18 May 2015 07:37:25 -0400 Received: by igbsb11 with SMTP id sb11so44884170igb.0 for ; Mon, 18 May 2015 04:37:24 -0700 (PDT) In-Reply-To: <1431948878-3756-1-git-send-email-me@bobcopeland.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Sasha Levin 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. Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin Signed-off-by: Bob Copeland --- 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 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) -- 2.1.4