cifs: fix up handling of prefixpath= option

[can-eth-gw-linux.git] / fs / cifs / dir.c

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 3b7e0c1266f7d86805a740a9ad4f711c96c9b85a..8719bbe0dcc36e32836cef3cf0b2b9c6e8a8175a 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -48,7 +48,7 @@ char *
 cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
                        struct cifs_tcon *tcon)
 {
-       int pplen = vol->prepath ? strlen(vol->prepath) : 0;
+       int pplen = vol->prepath ? strlen(vol->prepath) + 1 : 0;
        int dfsplen;
        char *full_path = NULL;
 
@@ -69,7 +69,8 @@ cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
 
        if (dfsplen)
                strncpy(full_path, tcon->treeName, dfsplen);
-       strncpy(full_path + dfsplen, vol->prepath, pplen);
+       full_path[dfsplen] = CIFS_DIR_SEP(cifs_sb);
+       strncpy(full_path + dfsplen + 1, vol->prepath, pplen);
        convert_delimiter(full_path, CIFS_DIR_SEP(cifs_sb));
        full_path[dfsplen + pplen] = 0; /* add trailing null */
        return full_path;