diff --git a/fs/exfat/exfat_nls.c b/fs/exfat/exfat_nls.c
index be7fbf92cc76..2f2f49137530 100644
--- a/fs/exfat/exfat_nls.c
+++ b/fs/exfat/exfat_nls.c
@@ -106,7 +106,7 @@ s32 nls_uniname_cmp(struct super_block *sb, u16 *a, u16 *b)
 	for (i = 0; i < MAX_NAME_LENGTH; i++, a++, b++) {
 		if (nls_upper(sb, *a) != nls_upper(sb, *b))
 			return 1;
-		if (*a == 0x0)
+		if ((*a == 0x0) || (*b == 0x0))
 			return 0;
 	}
 	return 0;
diff --git a/fs/exfat/exfat_nls.h b/fs/exfat/exfat_nls.h
index cdc175585411..ef88abc14cc6 100644
--- a/fs/exfat/exfat_nls.h
+++ b/fs/exfat/exfat_nls.h
@@ -48,11 +48,11 @@
 #define DOS_PAR_DIR_NAME        "..         "
 
 #ifdef __LITTLE_ENDIAN
-#define UNI_CUR_DIR_NAME        ".\0"
-#define UNI_PAR_DIR_NAME        ".\0.\0"
+#define UNI_CUR_DIR_NAME        ".\0\0\0"
+#define UNI_PAR_DIR_NAME        ".\0.\0\0\0"
 #else
-#define UNI_CUR_DIR_NAME        "\0."
-#define UNI_PAR_DIR_NAME        "\0.\0."
+#define UNI_CUR_DIR_NAME        "\0.\0\0"
+#define UNI_PAR_DIR_NAME        "\0.\0.\0\0"
 #endif
 
 /*----------------------------------------------------------------------*/