diff mbox

cifs.mount: mapchars + utf8 = loop

Message ID 20120917173919.54319010@corrin.poochiereds.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jeff Layton Sept. 18, 2012, 12:39 a.m. UTC
On Mon, 17 Sep 2012 15:31:38 +0200
Nicolas Lefebvre <nico.lefebvre@gmail.com> wrote:

> Hello,
> 
> I'm trying to mount a smb share with both "mapchars" and
> "iocharset=utf8" options and it seems to be bogus.
> I must used mapchars option because some folder names contain
> non-ascii characters and I must used iocharset=utf8 because some file
> names contain question marks.
> 
> I have searched on the internet and found a very simple patch for a
> 2.6.32 kernel (https://bugzilla.samba.org/show_bug.cgi?id=6767)
> 
> --- orig/linux-2.6.32/fs/cifs/misc.c 2009-12-03 04:51:21.000000000 +0100
> +++ linux-2.6.32/fs/cifs/misc.c 2011-10-09 22:25:10.767951322 +0200
> @@ -713,7 +713,7 @@
>      }
> 
>  ctoUCS_out:
> - return i;
> + return j;
>  }
> 
> But I'm on Ubuntu 12.04 with a 3.2.0-31 kernel and there is too much
> differences for me between the two misc.c files and I'm not able to
> report the patch in my kernel.
> 
> Did someone have an idea ?
> 

Looks like Baldvin never sent that patch to the list. This should be a
forward port of it. Does it work for you?

Comments

Nicolas Lefebvre Sept. 18, 2012, 5:15 p.m. UTC | #1
It works for me.
I could use both utf8 characters and special characters like
"interrogation marks", "colon" or "pipe" for example.
Do you think the patch could be integrated in new kernel.org kernel ?.

Nicolas Lefebvre

2012/9/18 Jeff Layton <jlayton@samba.org>:
> On Mon, 17 Sep 2012 15:31:38 +0200
> Nicolas Lefebvre <nico.lefebvre@gmail.com> wrote:
>
>> Hello,
>>
>> I'm trying to mount a smb share with both "mapchars" and
>> "iocharset=utf8" options and it seems to be bogus.
>> I must used mapchars option because some folder names contain
>> non-ascii characters and I must used iocharset=utf8 because some file
>> names contain question marks.
>>
>> I have searched on the internet and found a very simple patch for a
>> 2.6.32 kernel (https://bugzilla.samba.org/show_bug.cgi?id=6767)
>>
>> --- orig/linux-2.6.32/fs/cifs/misc.c 2009-12-03 04:51:21.000000000 +0100
>> +++ linux-2.6.32/fs/cifs/misc.c 2011-10-09 22:25:10.767951322 +0200
>> @@ -713,7 +713,7 @@
>>      }
>>
>>  ctoUCS_out:
>> - return i;
>> + return j;
>>  }
>>
>> But I'm on Ubuntu 12.04 with a 3.2.0-31 kernel and there is too much
>> differences for me between the two misc.c files and I'm not able to
>> report the patch in my kernel.
>>
>> Did someone have an idea ?
>>
>
> Looks like Baldvin never sent that patch to the list. This should be a
> forward port of it. Does it work for you?
>
> --
> Jeff Layton <jlayton@samba.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

From 3e61f98c4553276ef9187975a00721b6e6f4140d Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 17 Sep 2012 20:36:23 -0400
Subject: [PATCH] cifs: fix return value in cifsConvertToUCS

Reported-by: Baldvin Kovacs <baldvin.kovacs@gmail.com>
Reported-by: Nicolas Lefebvre <nico.lefebvre@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/cifs/cifs_unicode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 1b2e180..667776e 100644
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/cifs/cifs_unicode.c
@@ -327,6 +327,6 @@  cifsConvertToUCS(__le16 *target, const char *source, int srclen,
 	}
 
 ctoUCS_out:
-	return i;
+	return j;
 }
 
-- 
1.7.11.4