From patchwork Thu Apr 29 13:58:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Removed magic number for max username in parse_options. From: Scott Lovenberg X-Patchwork-Id: 51297 Message-Id: <1272549497-6578-2-git-send-email-scott.lovenberg@gmail.com> To: linux-cifs-client@lists.samba.org Cc: jlayton@samba.org Date: Thu, 29 Apr 2010 09:58:17 -0400 Replaced max username in parse_options with the sum of its potential parts for "domain/user%password" formatted values. Note that forward slashes still expand to a double back slash in the parse_username function, though. Signed-off-by: Scott Lovenberg --- mount.cifs.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/mount.cifs.c b/mount.cifs.c index 155d594..c1944ac 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -858,7 +858,11 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) return EX_USAGE; } } else { - if (strnlen(value, 260) >= 260) { + /* domain/username%password */ + const int max = MAX_DOMAIN_SIZE + + MAX_USERNAME_SIZE + + MOUNT_PASSWD_SIZE + 2; + if (strnlen(value, max + 1) >= max + 1) { fprintf(stderr, "username too long\n"); return EX_USAGE; }