From patchwork Thu Apr 29 15:05:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: mount.cifs: strip leading delimiter off of prefixpath option Date: Thu, 29 Apr 2010 05:05:20 -0000 From: Jeff Layton X-Patchwork-Id: 51298 Message-Id: <1272553520-22066-1-git-send-email-jlayton@samba.org> To: linux-cifs-client@lists.samba.org ...the kernel doesn't expect to see it and it causes a regression when mounting some UNCs. Reported-by: Ales Zelinka Signed-off-by: Jeff Layton --- mount.cifs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/mount.cifs.c b/mount.cifs.c index 1040e8b..6e5afe3 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -1168,7 +1168,7 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info return EX_USAGE; } - prepath = share + sharelen; + prepath = share + sharelen + 1; prepathlen = strlen(prepath); if (prepathlen + 1 > sizeof(parsed_info->prefix)) { @@ -1669,6 +1669,7 @@ int main(int argc, char **argv) goto mount_exit; } + /* lengths of different strings + slashes + trailing \0 */ dev_len = strnlen(parsed_info->host, sizeof(parsed_info->host)) + strnlen(parsed_info->share, sizeof(parsed_info->share)) + strnlen(parsed_info->prefix, sizeof(parsed_info->prefix)) + @@ -1684,6 +1685,7 @@ int main(int argc, char **argv) strlcat(dev_name, parsed_info->host, dev_len); strlcat(dev_name, "/", dev_len); strlcat(dev_name, parsed_info->share, dev_len); + strlcat(dev_name, "/", dev_len); strlcat(dev_name, parsed_info->prefix, dev_len); currentaddress = parsed_info->addrlist;