Skip to contentSkip to conversation

cifs: fix FILE_BOTH_DIRECTORY_INFO definition

PATCH Applied Eugene Korenevsky 2 participants 2 messages Jan 11, 2022 – Jan 12, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: fix FILE_BOTH_DIRECTORY_INFO definition

The size of FILE_BOTH_DIRECTORY_INFO.ShortName must be 24 bytes, not 12 (see MS-FSCC documentation).

---
 fs/cifs/cifspdu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifspdu.h +1 -1
index d2ff438fd31f..68b9a436af4b 100644
@@ -2560,7 +2560,7 @@ typedef struct {
 	__le32 EaSize; /* length of the xattrs */
 	__u8   ShortNameLength;
 	__u8   Reserved;
-	__u8   ShortName[12];
+	__u8   ShortName[24];
 	char FileName[1];
 } __attribute__((packed)) FILE_BOTH_DIRECTORY_INFO; /* level 0x104 FFrsp data */
 
Signature · 1 line
2.30.2
Applied
#1 lore raw

Merged into cifs-2.6.git for-next

Quoted 25 lines · Eugene Korenevsky

The size of FILE_BOTH_DIRECTORY_INFO.ShortName must be 24 bytes, not 12 (see MS-FSCC documentation).

---
 fs/cifs/cifspdu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifspdu.h +1 -2
index d2ff438fd31f..68b9a436af4b 100644
@@ -2560,7 +2560,7 @@ typedef struct {
        __le32 EaSize; /* length of the xattrs */
        __u8   ShortNameLength;
        __u8   Reserved;
-       __u8   ShortName[12];
+       __u8   ShortName[24];
        char FileName[1];
 } __attribute__((packed)) FILE_BOTH_DIRECTORY_INFO; /* level 0x104 FFrsp data */
 
--

2.30.2

Signature · 3 lines
Thanks,

Steve