summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-05-02 14:02:40 -0400
committerSteve French <sfrench@us.ibm.com>2012-05-03 13:50:01 -0500
commita557b97616c49d81e09c8439831d4c4f13ef4050 (patch)
tree11824355379fb4272353c4e7e240acd6fabbba02
parentf966424e9935900e34cace8116d37aa70cff23d0 (diff)
downloadlinux-3.10-a557b97616c49d81e09c8439831d4c4f13ef4050.tar.gz
linux-3.10-a557b97616c49d81e09c8439831d4c4f13ef4050.tar.bz2
linux-3.10-a557b97616c49d81e09c8439831d4c4f13ef4050.zip
cifs: make sure we ignore the credentials= and cred= options
Older mount.cifs programs passed this on to the kernel after parsing the file. Make sure the kernel ignores that option. Should fix: https://bugzilla.kernel.org/show_bug.cgi?id=43195 Cc: Sachin Prabhu <sprabhu@redhat.com> Reported-by: Ronald <ronald645@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/connect.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a75902b28bf..5dcc55197fb 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -215,6 +215,8 @@ static const match_table_t cifs_mount_option_tokens = {
{ Opt_ignore, "cred" },
{ Opt_ignore, "credentials" },
+ { Opt_ignore, "cred=%s" },
+ { Opt_ignore, "credentials=%s" },
{ Opt_ignore, "guest" },
{ Opt_ignore, "rw" },
{ Opt_ignore, "ro" },