diff options
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 741ff0c69f37..3c628bf667a5 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
| @@ -567,7 +567,7 @@ DelFileRetry: | |||
| 567 | 567 | ||
| 568 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 568 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 569 | name_len = | 569 | name_len = |
| 570 | cifsConvertToUCS((__u16 *) pSMB->fileName, fileName, | 570 | cifsConvertToUCS((__le16 *) pSMB->fileName, fileName, |
| 571 | PATH_MAX, nls_codepage, remap); | 571 | PATH_MAX, nls_codepage, remap); |
| 572 | name_len++; /* trailing null */ | 572 | name_len++; /* trailing null */ |
| 573 | name_len *= 2; | 573 | name_len *= 2; |
| @@ -665,7 +665,7 @@ MkDirRetry: | |||
| 665 | return rc; | 665 | return rc; |
| 666 | 666 | ||
| 667 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 667 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 668 | name_len = cifsConvertToUCS((__u16 *) pSMB->DirName, name, | 668 | name_len = cifsConvertToUCS((__le16 *) pSMB->DirName, name, |
| 669 | PATH_MAX, nls_codepage, remap); | 669 | PATH_MAX, nls_codepage, remap); |
| 670 | name_len++; /* trailing null */ | 670 | name_len++; /* trailing null */ |
| 671 | name_len *= 2; | 671 | name_len *= 2; |
| @@ -719,7 +719,7 @@ openRetry: | |||
| 719 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 719 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 720 | count = 1; /* account for one byte pad to word boundary */ | 720 | count = 1; /* account for one byte pad to word boundary */ |
| 721 | name_len = | 721 | name_len = |
| 722 | cifsConvertToUCS((__u16 *) (pSMB->fileName + 1), | 722 | cifsConvertToUCS((__le16 *) (pSMB->fileName + 1), |
| 723 | fileName, PATH_MAX, nls_codepage, remap); | 723 | fileName, PATH_MAX, nls_codepage, remap); |
| 724 | name_len++; /* trailing null */ | 724 | name_len++; /* trailing null */ |
| 725 | name_len *= 2; | 725 | name_len *= 2; |
| @@ -1141,7 +1141,7 @@ renameRetry: | |||
| 1141 | 1141 | ||
| 1142 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 1142 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 1143 | name_len = | 1143 | name_len = |
| 1144 | cifsConvertToUCS((__u16 *) pSMB->OldFileName, fromName, | 1144 | cifsConvertToUCS((__le16 *) pSMB->OldFileName, fromName, |
| 1145 | PATH_MAX, nls_codepage, remap); | 1145 | PATH_MAX, nls_codepage, remap); |
| 1146 | name_len++; /* trailing null */ | 1146 | name_len++; /* trailing null */ |
| 1147 | name_len *= 2; | 1147 | name_len *= 2; |
| @@ -1149,7 +1149,7 @@ renameRetry: | |||
| 1149 | /* protocol requires ASCII signature byte on Unicode string */ | 1149 | /* protocol requires ASCII signature byte on Unicode string */ |
| 1150 | pSMB->OldFileName[name_len + 1] = 0x00; | 1150 | pSMB->OldFileName[name_len + 1] = 0x00; |
| 1151 | name_len2 = | 1151 | name_len2 = |
| 1152 | cifsConvertToUCS((__u16 *) &pSMB->OldFileName[name_len + 2], | 1152 | cifsConvertToUCS((__le16 *) &pSMB->OldFileName[name_len + 2], |
| 1153 | toName, PATH_MAX, nls_codepage, remap); | 1153 | toName, PATH_MAX, nls_codepage, remap); |
| 1154 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; | 1154 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; |
| 1155 | name_len2 *= 2; /* convert to bytes */ | 1155 | name_len2 *= 2; /* convert to bytes */ |
| @@ -1236,10 +1236,10 @@ int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon, | |||
| 1236 | /* unicode only call */ | 1236 | /* unicode only call */ |
| 1237 | if(target_name == NULL) { | 1237 | if(target_name == NULL) { |
| 1238 | sprintf(dummy_string,"cifs%x",pSMB->hdr.Mid); | 1238 | sprintf(dummy_string,"cifs%x",pSMB->hdr.Mid); |
| 1239 | len_of_str = cifsConvertToUCS((__u16 *)rename_info->target_name, | 1239 | len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name, |
| 1240 | dummy_string, 24, nls_codepage, remap); | 1240 | dummy_string, 24, nls_codepage, remap); |
| 1241 | } else { | 1241 | } else { |
| 1242 | len_of_str = cifsConvertToUCS((__u16 *)rename_info->target_name, | 1242 | len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name, |
| 1243 | target_name, PATH_MAX, nls_codepage, remap); | 1243 | target_name, PATH_MAX, nls_codepage, remap); |
| 1244 | } | 1244 | } |
| 1245 | rename_info->target_name_len = cpu_to_le32(2 * len_of_str); | 1245 | rename_info->target_name_len = cpu_to_le32(2 * len_of_str); |
| @@ -1296,7 +1296,7 @@ copyRetry: | |||
| 1296 | pSMB->Flags = cpu_to_le16(flags & COPY_TREE); | 1296 | pSMB->Flags = cpu_to_le16(flags & COPY_TREE); |
| 1297 | 1297 | ||
| 1298 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 1298 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 1299 | name_len = cifsConvertToUCS((__u16 *) pSMB->OldFileName, | 1299 | name_len = cifsConvertToUCS((__le16 *) pSMB->OldFileName, |
| 1300 | fromName, PATH_MAX, nls_codepage, | 1300 | fromName, PATH_MAX, nls_codepage, |
| 1301 | remap); | 1301 | remap); |
| 1302 | name_len++; /* trailing null */ | 1302 | name_len++; /* trailing null */ |
| @@ -1304,7 +1304,7 @@ copyRetry: | |||
| 1304 | pSMB->OldFileName[name_len] = 0x04; /* pad */ | 1304 | pSMB->OldFileName[name_len] = 0x04; /* pad */ |
| 1305 | /* protocol requires ASCII signature byte on Unicode string */ | 1305 | /* protocol requires ASCII signature byte on Unicode string */ |
| 1306 | pSMB->OldFileName[name_len + 1] = 0x00; | 1306 | pSMB->OldFileName[name_len + 1] = 0x00; |
| 1307 | name_len2 = cifsConvertToUCS((__u16 *)&pSMB->OldFileName[name_len + 2], | 1307 | name_len2 = cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2], |
| 1308 | toName, PATH_MAX, nls_codepage, remap); | 1308 | toName, PATH_MAX, nls_codepage, remap); |
| 1309 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; | 1309 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; |
| 1310 | name_len2 *= 2; /* convert to bytes */ | 1310 | name_len2 *= 2; /* convert to bytes */ |
| @@ -1453,7 +1453,7 @@ createHardLinkRetry: | |||
| 1453 | return rc; | 1453 | return rc; |
| 1454 | 1454 | ||
| 1455 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 1455 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 1456 | name_len = cifsConvertToUCS((__u16 *) pSMB->FileName, toName, | 1456 | name_len = cifsConvertToUCS((__le16 *) pSMB->FileName, toName, |
| 1457 | PATH_MAX, nls_codepage, remap); | 1457 | PATH_MAX, nls_codepage, remap); |
| 1458 | name_len++; /* trailing null */ | 1458 | name_len++; /* trailing null */ |
| 1459 | name_len *= 2; | 1459 | name_len *= 2; |
| @@ -1476,7 +1476,7 @@ createHardLinkRetry: | |||
| 1476 | data_offset = (char *) (&pSMB->hdr.Protocol) + offset; | 1476 | data_offset = (char *) (&pSMB->hdr.Protocol) + offset; |
| 1477 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 1477 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 1478 | name_len_target = | 1478 | name_len_target = |
| 1479 | cifsConvertToUCS((__u16 *) data_offset, fromName, PATH_MAX, | 1479 | cifsConvertToUCS((__le16 *) data_offset, fromName, PATH_MAX, |
| 1480 | nls_codepage, remap); | 1480 | nls_codepage, remap); |
| 1481 | name_len_target++; /* trailing null */ | 1481 | name_len_target++; /* trailing null */ |
| 1482 | name_len_target *= 2; | 1482 | name_len_target *= 2; |
| @@ -1546,14 +1546,14 @@ winCreateHardLinkRetry: | |||
| 1546 | 1546 | ||
| 1547 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 1547 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 1548 | name_len = | 1548 | name_len = |
| 1549 | cifsConvertToUCS((__u16 *) pSMB->OldFileName, fromName, | 1549 | cifsConvertToUCS((__le16 *) pSMB->OldFileName, fromName, |
| 1550 | PATH_MAX, nls_codepage, remap); | 1550 | PATH_MAX, nls_codepage, remap); |
| 1551 | name_len++; /* trailing null */ | 1551 | name_len++; /* trailing null */ |
| 1552 | name_len *= 2; | 1552 | name_len *= 2; |
| 1553 | pSMB->OldFileName[name_len] = 0; /* pad */ | 1553 | pSMB->OldFileName[name_len] = 0; /* pad */ |
| 1554 | pSMB->OldFileName[name_len + 1] = 0x04; | 1554 | pSMB->OldFileName[name_len + 1] = 0x04; |
| 1555 | name_len2 = | 1555 | name_len2 = |
| 1556 | cifsConvertToUCS((__u16 *)&pSMB->OldFileName[name_len + 2], | 1556 | cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2], |
| 1557 | toName, PATH_MAX, nls_codepage, remap); | 1557 | toName, PATH_MAX, nls_codepage, remap); |
| 1558 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; | 1558 | name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; |
| 1559 | name_len2 *= 2; /* convert to bytes */ | 1559 | name_len2 *= 2; /* convert to bytes */ |
| @@ -1939,7 +1939,7 @@ queryAclRetry: | |||
| 1939 | 1939 | ||
| 1940 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 1940 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 1941 | name_len = | 1941 | name_len = |
| 1942 | cifsConvertToUCS((__u16 *) pSMB->FileName, searchName, | 1942 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, |
| 1943 | PATH_MAX, nls_codepage, remap); | 1943 | PATH_MAX, nls_codepage, remap); |
| 1944 | name_len++; /* trailing null */ | 1944 | name_len++; /* trailing null */ |
| 1945 | name_len *= 2; | 1945 | name_len *= 2; |
| @@ -2024,7 +2024,7 @@ setAclRetry: | |||
| 2024 | return rc; | 2024 | return rc; |
| 2025 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 2025 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2026 | name_len = | 2026 | name_len = |
| 2027 | cifsConvertToUCS((__u16 *) pSMB->FileName, fileName, | 2027 | cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, |
| 2028 | PATH_MAX, nls_codepage, remap); | 2028 | PATH_MAX, nls_codepage, remap); |
| 2029 | name_len++; /* trailing null */ | 2029 | name_len++; /* trailing null */ |
| 2030 | name_len *= 2; | 2030 | name_len *= 2; |
| @@ -2188,7 +2188,7 @@ QPathInfoRetry: | |||
| 2188 | 2188 | ||
| 2189 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 2189 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2190 | name_len = | 2190 | name_len = |
| 2191 | cifsConvertToUCS((__u16 *) pSMB->FileName, searchName, | 2191 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, |
| 2192 | PATH_MAX, nls_codepage, remap); | 2192 | PATH_MAX, nls_codepage, remap); |
| 2193 | name_len++; /* trailing null */ | 2193 | name_len++; /* trailing null */ |
| 2194 | name_len *= 2; | 2194 | name_len *= 2; |
| @@ -2269,7 +2269,7 @@ UnixQPathInfoRetry: | |||
| 2269 | 2269 | ||
| 2270 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 2270 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2271 | name_len = | 2271 | name_len = |
| 2272 | cifsConvertToUCS((__u16 *) pSMB->FileName, searchName, | 2272 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, |
| 2273 | PATH_MAX, nls_codepage, remap); | 2273 | PATH_MAX, nls_codepage, remap); |
| 2274 | name_len++; /* trailing null */ | 2274 | name_len++; /* trailing null */ |
| 2275 | name_len *= 2; | 2275 | name_len *= 2; |
| @@ -2350,7 +2350,7 @@ findUniqueRetry: | |||
| 2350 | 2350 | ||
| 2351 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 2351 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2352 | name_len = | 2352 | name_len = |
| 2353 | cifsConvertToUCS((wchar_t *) pSMB->FileName, searchName, PATH_MAX | 2353 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, PATH_MAX |
| 2354 | /* find define for this maxpathcomponent */ | 2354 | /* find define for this maxpathcomponent */ |
| 2355 | , nls_codepage); | 2355 | , nls_codepage); |
| 2356 | name_len++; /* trailing null */ | 2356 | name_len++; /* trailing null */ |
| @@ -2435,7 +2435,7 @@ findFirstRetry: | |||
| 2435 | 2435 | ||
| 2436 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 2436 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2437 | name_len = | 2437 | name_len = |
| 2438 | cifsConvertToUCS((__u16 *) pSMB->FileName,searchName, | 2438 | cifsConvertToUCS((__le16 *) pSMB->FileName,searchName, |
| 2439 | PATH_MAX, nls_codepage, remap); | 2439 | PATH_MAX, nls_codepage, remap); |
| 2440 | /* We can not add the asterik earlier in case | 2440 | /* We can not add the asterik earlier in case |
| 2441 | it got remapped to 0xF03A as if it were part of the | 2441 | it got remapped to 0xF03A as if it were part of the |
| @@ -2726,7 +2726,7 @@ GetInodeNumberRetry: | |||
| 2726 | 2726 | ||
| 2727 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 2727 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 2728 | name_len = | 2728 | name_len = |
| 2729 | cifsConvertToUCS((__u16 *) pSMB->FileName, searchName, | 2729 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, |
| 2730 | PATH_MAX,nls_codepage, remap); | 2730 | PATH_MAX,nls_codepage, remap); |
| 2731 | name_len++; /* trailing null */ | 2731 | name_len++; /* trailing null */ |
| 2732 | name_len *= 2; | 2732 | name_len *= 2; |
| @@ -2837,7 +2837,7 @@ getDFSRetry: | |||
| 2837 | if (ses->capabilities & CAP_UNICODE) { | 2837 | if (ses->capabilities & CAP_UNICODE) { |
| 2838 | pSMB->hdr.Flags2 |= SMBFLG2_UNICODE; | 2838 | pSMB->hdr.Flags2 |= SMBFLG2_UNICODE; |
| 2839 | name_len = | 2839 | name_len = |
| 2840 | cifsConvertToUCS((__u16 *) pSMB->RequestFileName, | 2840 | cifsConvertToUCS((__le16 *) pSMB->RequestFileName, |
| 2841 | searchName, PATH_MAX, nls_codepage, remap); | 2841 | searchName, PATH_MAX, nls_codepage, remap); |
| 2842 | name_len++; /* trailing null */ | 2842 | name_len++; /* trailing null */ |
| 2843 | name_len *= 2; | 2843 | name_len *= 2; |
| @@ -3369,7 +3369,7 @@ SetEOFRetry: | |||
| 3369 | 3369 | ||
| 3370 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 3370 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 3371 | name_len = | 3371 | name_len = |
| 3372 | cifsConvertToUCS((__u16 *) pSMB->FileName, fileName, | 3372 | cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, |
| 3373 | PATH_MAX, nls_codepage, remap); | 3373 | PATH_MAX, nls_codepage, remap); |
| 3374 | name_len++; /* trailing null */ | 3374 | name_len++; /* trailing null */ |
| 3375 | name_len *= 2; | 3375 | name_len *= 2; |
| @@ -3627,7 +3627,7 @@ SetTimesRetry: | |||
| 3627 | 3627 | ||
| 3628 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 3628 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 3629 | name_len = | 3629 | name_len = |
| 3630 | cifsConvertToUCS((__u16 *) pSMB->FileName, fileName, | 3630 | cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, |
| 3631 | PATH_MAX, nls_codepage, remap); | 3631 | PATH_MAX, nls_codepage, remap); |
| 3632 | name_len++; /* trailing null */ | 3632 | name_len++; /* trailing null */ |
| 3633 | name_len *= 2; | 3633 | name_len *= 2; |
| @@ -3708,7 +3708,7 @@ SetAttrLgcyRetry: | |||
| 3708 | 3708 | ||
| 3709 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 3709 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 3710 | name_len = | 3710 | name_len = |
| 3711 | ConvertToUCS((wchar_t *) pSMB->fileName, fileName, | 3711 | ConvertToUCS((__le16 *) pSMB->fileName, fileName, |
| 3712 | PATH_MAX, nls_codepage); | 3712 | PATH_MAX, nls_codepage); |
| 3713 | name_len++; /* trailing null */ | 3713 | name_len++; /* trailing null */ |
| 3714 | name_len *= 2; | 3714 | name_len *= 2; |
| @@ -3759,7 +3759,7 @@ setPermsRetry: | |||
| 3759 | 3759 | ||
| 3760 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 3760 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 3761 | name_len = | 3761 | name_len = |
| 3762 | cifsConvertToUCS((__u16 *) pSMB->FileName, fileName, | 3762 | cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, |
| 3763 | PATH_MAX, nls_codepage, remap); | 3763 | PATH_MAX, nls_codepage, remap); |
| 3764 | name_len++; /* trailing null */ | 3764 | name_len++; /* trailing null */ |
| 3765 | name_len *= 2; | 3765 | name_len *= 2; |
| @@ -3904,7 +3904,7 @@ QAllEAsRetry: | |||
| 3904 | 3904 | ||
| 3905 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 3905 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 3906 | name_len = | 3906 | name_len = |
| 3907 | cifsConvertToUCS((wchar_t *) pSMB->FileName, searchName, | 3907 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, |
| 3908 | PATH_MAX, nls_codepage, remap); | 3908 | PATH_MAX, nls_codepage, remap); |
| 3909 | name_len++; /* trailing null */ | 3909 | name_len++; /* trailing null */ |
| 3910 | name_len *= 2; | 3910 | name_len *= 2; |
| @@ -4047,7 +4047,7 @@ QEARetry: | |||
| 4047 | 4047 | ||
| 4048 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 4048 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 4049 | name_len = | 4049 | name_len = |
| 4050 | cifsConvertToUCS((__u16 *) pSMB->FileName, searchName, | 4050 | cifsConvertToUCS((__le16 *) pSMB->FileName, searchName, |
| 4051 | PATH_MAX, nls_codepage, remap); | 4051 | PATH_MAX, nls_codepage, remap); |
| 4052 | name_len++; /* trailing null */ | 4052 | name_len++; /* trailing null */ |
| 4053 | name_len *= 2; | 4053 | name_len *= 2; |
| @@ -4194,7 +4194,7 @@ SetEARetry: | |||
| 4194 | 4194 | ||
| 4195 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { | 4195 | if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { |
| 4196 | name_len = | 4196 | name_len = |
| 4197 | cifsConvertToUCS((__u16 *) pSMB->FileName, fileName, | 4197 | cifsConvertToUCS((__le16 *) pSMB->FileName, fileName, |
| 4198 | PATH_MAX, nls_codepage, remap); | 4198 | PATH_MAX, nls_codepage, remap); |
| 4199 | name_len++; /* trailing null */ | 4199 | name_len++; /* trailing null */ |
| 4200 | name_len *= 2; | 4200 | name_len *= 2; |
