| Message ID | Yd1BojYhOVOkyoZt@himera.home |
|---|---|
| State | New |
| Headers | show |
| Series | cifs: fix FILE_BOTH_DIRECTORY_INFO definition | expand |
Merged into cifs-2.6.git for-next On Tue, Jan 11, 2022 at 6:16 PM Eugene Korenevsky <ekorenevsky@astralinux.ru> wrote: > > The size of FILE_BOTH_DIRECTORY_INFO.ShortName must be 24 bytes, not 12 > (see MS-FSCC documentation). > > Signed-off-by: Eugene Korenevsky <ekorenevsky@astralinux.ru> > --- > fs/cifs/cifspdu.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h > index d2ff438fd31f..68b9a436af4b 100644 > --- a/fs/cifs/cifspdu.h > +++ b/fs/cifs/cifspdu.h > @@ -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 >
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index d2ff438fd31f..68b9a436af4b 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -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 */
The size of FILE_BOTH_DIRECTORY_INFO.ShortName must be 24 bytes, not 12 (see MS-FSCC documentation). Signed-off-by: Eugene Korenevsky <ekorenevsky@astralinux.ru> --- fs/cifs/cifspdu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)