| Message ID | 1272626489-21264-1-git-send-email-jlayton@samba.org |
|---|---|
| State | New |
| Headers | show |
On Fri, 30 Apr 2010 07:21:29 -0400 Jeff Layton <jlayton@samba.org> wrote: > ...the kernel doesn't expect to see it and it causes a regression > when mounting some UNCs. > > Reported-by: Ales Zelinka <azelinka@redhat.com> > Signed-off-by: Jeff Layton <jlayton@samba.org> > --- > mount.cifs.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/mount.cifs.c b/mount.cifs.c > index 1040e8b..c4eb59a 100644 > --- a/mount.cifs.c > +++ b/mount.cifs.c > @@ -1169,6 +1169,9 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info > } > > prepath = share + sharelen; > + if (*prepath != '\0') > + prepath++; > + > prepathlen = strlen(prepath); > > if (prepathlen + 1 > sizeof(parsed_info->prefix)) { > @@ -1669,6 +1672,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 +1688,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; Ales tested this patch as well and it seems to work as expected. Committed to repo and should make cifs-utils-4.5.
diff --git a/mount.cifs.c b/mount.cifs.c index 1040e8b..c4eb59a 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -1169,6 +1169,9 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info } prepath = share + sharelen; + if (*prepath != '\0') + prepath++; + prepathlen = strlen(prepath); if (prepathlen + 1 > sizeof(parsed_info->prefix)) { @@ -1669,6 +1672,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 +1688,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;
...the kernel doesn't expect to see it and it causes a regression when mounting some UNCs. Reported-by: Ales Zelinka <azelinka@redhat.com> Signed-off-by: Jeff Layton <jlayton@samba.org> --- mount.cifs.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)