From: Scott Lovenberg <scott.lovenberg@xxxxxxxxx>
The max size of the username, domain, password and share name strings
are now consistent with the kernel and Microsoft's documentation.
Signed-off-by: Scott Lovenberg <scott.lovenberg@xxxxxxxxx>
---
AUTHORS | 2 ++
mount.cifs.c | 27 ++++++++++++++++++---------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 2807079..2f6a14d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,5 +5,7 @@ Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Suresh Jayaraman <sjayaraman@xxxxxxx>
Pavel Shilovsky <piastry@xxxxxxxxxxx>
Igor Druzhinin <jaxbrigs@xxxxxxxxx>
+Scott Lovenberg <scott.lovenberg@xxxxxxxxx>
+
...and others.
diff --git a/mount.cifs.c b/mount.cifs.c
index 3b2b89e..8d975b3 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -83,22 +83,31 @@
/* max length of mtab options */
#define MTAB_OPTIONS_LEN 220
-/*
- * Maximum length of "share" portion of a UNC. I have no idea if this is at
- * all valid. According to MSDN, the typical max length of any component is
- * 255, so use that here.
+/*
+ * Max share name, username, password and domain sizes match the kernel's
+ * allowances for these string sizes which in turn match Microsoft's
+ * documentation.
*/
-#define MAX_SHARE_LEN 256
-/* max length of username (somewhat made up here) */
-#define MAX_USERNAME_SIZE 32
+/* Max length of the share name portion of a UNC. According to Microsoft
+ * this is correct for Windows 2000/XP. */
+#define MAX_SHARE_LEN 80
+
+/* Max user name length. */
+#define MAX_USERNAME_SIZE 256
+
+/* Max domain size. */
+#define MAX_DOMAIN_SIZE 256
+
+/* Max password size. */
+#define MOUNT_PASSWD_SIZE 512
+
+
#ifndef SAFE_FREE
#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x = NULL; } } while (0)
#endif
-#define MOUNT_PASSWD_SIZE 128
-#define MAX_DOMAIN_SIZE 64
/*
* mount.cifs has been the subject of many "security" bugs that have arisen
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
