From db415f7aae07cadcabd5d2a659f8ad825c905299 Mon Sep 17 00:00:00 2001

From: Ilya Ponetayev <i.ponetaev@ndmsystems.com>

Date: Thu, 16 Jul 2020 17:27:53 +0900

Subject: [Backport db415f7aae07] exfat: fix name_hash computation on big

 endian systems

On-disk format for name_hash field is LE, so it must be explicitly

transformed on BE system for proper result.

Fixes: 370e812b3ec1 ("exfat: add nls operations")

Cc: stable@vger.kernel.org # v5.7

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>

Signed-off-by: Ilya Ponetayev <i.ponetaev@ndmsystems.com>

Reviewed-by: Sungjong Seo <sj1557.seo@samsung.com>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/nls.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nls.c b/src/nls.c

index 57b5a7a4d1f7a18b1854348bd6841ea7bc9c466a..a3c927501e676f3b240eca17106b07a296d99e6f 100644

--- a/src/nls.c

+++ b/src/nls.c

@@ -495,7 +495,7 @@ static int exfat_utf8_to_utf16(struct super_block *sb,

 		struct exfat_uni_name *p_uniname, int *p_lossy)

 {

 	int i, unilen, lossy = NLS_NAME_NO_LOSSY;

-	unsigned short upname[MAX_NAME_LENGTH + 1];

+	__le16 upname[MAX_NAME_LENGTH + 1];

 	unsigned short *uniname = p_uniname->name;

 	WARN_ON(!len);

@@ -519,7 +519,7 @@ static int exfat_utf8_to_utf16(struct super_block *sb,

 		    exfat_wstrchr(bad_uni_chars, *uniname))

 			lossy |= NLS_NAME_LOSSY;

-		upname[i] = exfat_toupper(sb, *uniname);

+		upname[i] = cpu_to_le16(exfat_toupper(sb, *uniname));

 		uniname++;

 	}

@@ -597,7 +597,7 @@ static int exfat_nls_to_ucs2(struct super_block *sb,

 		struct exfat_uni_name *p_uniname, int *p_lossy)

 {

 	int i = 0, unilen = 0, lossy = NLS_NAME_NO_LOSSY;

-	unsigned short upname[MAX_NAME_LENGTH + 1];

+	__le16 upname[MAX_NAME_LENGTH + 1];

 	unsigned short *uniname = p_uniname->name;

 	struct nls_table *nls = EXFAT_SB(sb)->nls_io;

@@ -611,7 +611,7 @@ static int exfat_nls_to_ucs2(struct super_block *sb,

 		    exfat_wstrchr(bad_uni_chars, *uniname))

 			lossy |= NLS_NAME_LOSSY;

-		upname[unilen] = exfat_toupper(sb, *uniname);

+		upname[unilen] = cpu_to_le16(exfat_toupper(sb, *uniname));

 		uniname++;

 		unilen++;

 	}

-- 

2.31.1