Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Eric Biggers <ebiggers3@gmail.com>
To:     David Howells <dhowells@redhat.com>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        linux-fsdevel@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, Eric Biggers <ebiggers@google.com>
Subject: [PATCH 05/18] fs_context: fix mount option blacklist
Date:   Sun,  8 Jul 2018 14:01:41 -0700
Message-Id: <20180708210154.10423-6-ebiggers3@gmail.com>
In-Reply-To: <20180708210154.10423-1-ebiggers3@gmail.com>
References: <20180708210154.10423-1-ebiggers3@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Eric Biggers <ebiggers@google.com>

The blacklist didn't actually do anything, since match_token() always
returned 0.

Fixes: 8a2e54b8af88 ("vfs: Implement a filesystem superblock creation/configuration context")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/fs_context.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/fs/fs_context.c b/fs/fs_context.c
index a0e22f4c6b64a..7a8d1ed34ae71 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -65,26 +65,26 @@ static const match_table_t common_clear_sb_flag = {
 };
 
 static const match_table_t forbidden_sb_flag = {
-	{ 0,	"bind" },
-	{ 0,	"move" },
-	{ 0,	"private" },
-	{ 0,	"remount" },
-	{ 0,	"shared" },
-	{ 0,	"slave" },
-	{ 0,	"unbindable" },
-	{ 0,	"rec" },
-	{ 0,	"noatime" },
-	{ 0,	"relatime" },
-	{ 0,	"norelatime" },
-	{ 0,	"strictatime" },
-	{ 0,	"nostrictatime" },
-	{ 0,	"nodiratime" },
-	{ 0,	"dev" },
-	{ 0,	"nodev" },
-	{ 0,	"exec" },
-	{ 0,	"noexec" },
-	{ 0,	"suid" },
-	{ 0,	"nosuid" },
+	{ 1,	"bind" },
+	{ 1,	"move" },
+	{ 1,	"private" },
+	{ 1,	"remount" },
+	{ 1,	"shared" },
+	{ 1,	"slave" },
+	{ 1,	"unbindable" },
+	{ 1,	"rec" },
+	{ 1,	"noatime" },
+	{ 1,	"relatime" },
+	{ 1,	"norelatime" },
+	{ 1,	"strictatime" },
+	{ 1,	"nostrictatime" },
+	{ 1,	"nodiratime" },
+	{ 1,	"dev" },
+	{ 1,	"nodev" },
+	{ 1,	"exec" },
+	{ 1,	"noexec" },
+	{ 1,	"suid" },
+	{ 1,	"nosuid" },
 	{ },
 };
 
-- 
2.18.0