All of lore.kernel.org
 help / color / mirror / Atom feed
From: Federico Sauter <fsauter-LVkJPw3T+odGBRGhe+f61g@public.gmane.org>
To: smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	sjayaraman-IBi9RG/b67k@public.gmane.org
Subject: [PATCH] Convert slashes in the UNC parameter to backslashes
Date: Tue, 06 Nov 2012 13:29:47 +0100	[thread overview]
Message-ID: <509902BB.6020400@innominate.com> (raw)

This patch ensures that slashes used as separators in the
UNC are properly converted to backslashes. The existing
implementation did not perform that conversion and that
lead to a "invalid argument" error when specifying an UNC
explicitly which contained slashes in it.

---
  fs/cifs/connect.c |   12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 5c670b9..8f4c76f 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1108,6 +1108,7 @@ cifs_parse_mount_options(const char *mountdata, 
const char *devname,
  	char *string = NULL;
  	char *tmp_end, *value;
  	char delim;
+	char *p, *q;

  	separator[0] = ',';
  	separator[1] = 0;
@@ -1573,12 +1574,11 @@ cifs_parse_mount_options(const char *mountdata, 
const char *devname,
  				printk(KERN_WARNING "CIFS: no memory for UNC\n");
  				goto cifs_parse_mount_err;
  			}
-			strcpy(vol->UNC, string);
-
-			if (strncmp(string, "//", 2) == 0) {
-				vol->UNC[0] = '\\';
-				vol->UNC[1] = '\\';
-			} else if (strncmp(string, "\\\\", 2) != 0) {
+			for (p = string, q = vol->UNC; *p; ++p, ++q) {
+				*q = *p == '/'? '\\' : *p;
+			}
+			*q = '\0';
+			if (strncmp(vol->UNC, "\\\\", 2) != 0) {
  				printk(KERN_WARNING "CIFS: UNC Path does not "
  						    "begin with // or \\\\\n");
  				goto cifs_parse_mount_err;
-- 
1.7.2.5

             reply	other threads:[~2012-11-06 12:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-06 12:29 Federico Sauter [this message]
     [not found] ` <509902BB.6020400-LVkJPw3T+odGBRGhe+f61g@public.gmane.org>
2012-11-07 12:02   ` [PATCH] Convert slashes in the UNC parameter to backslashes Jeff Layton
     [not found]     ` <20121107070239.1140fe68-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2012-11-07 15:20       ` Federico Sauter
     [not found]         ` <509A7C36.8080800-LVkJPw3T+odGBRGhe+f61g@public.gmane.org>
2012-11-07 15:48           ` Jeff Layton
     [not found]             ` <20121107104853.12935810-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2012-11-07 16:42               ` Scott Lovenberg
     [not found]                 ` <CAFB9KM02kdNwrNVO42r67emTaiRshSB1+sxDOwnOpNwSUyskZQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-11-07 18:21                   ` Jeff Layton
     [not found]                     ` <20121107132107.007a031d-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2012-11-08 12:16                       ` Federico Sauter
     [not found]                         ` <509BA299.4000805-LVkJPw3T+odGBRGhe+f61g@public.gmane.org>
2012-11-09 11:19                           ` Jeff Layton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=509902BB.6020400@innominate.com \
    --to=fsauter-lvkjpw3t+odgbrghe+f61g@public.gmane.org \
    --cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=sjayaraman-IBi9RG/b67k@public.gmane.org \
    --cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.