smb/client: fix unaligned reads in wsl_to_fattr()
Subsystems (2)
PATCH 1/1 smb/client: fix unaligned reads in wsl_to_fattr()
From: Youling Tang <[email protected]>
See MS-FSCC 2.4.16. When multiple FILE_FULL_EA_INFORMATION data elements are present in the buffer, each MUST be aligned on a 4-byte boundary.
When parsing WSL extended attributes, the code derives the value pointer at an offset of 7 (SMB2_WSL_XATTR_NAME_LEN + 1) from ea_data, the value sits at an unaligned offset.
We should use get_unaligned_le32() or get_unaligned_le64() to get unaligned values.
--- fs/smb/client/reparse.c | 6 +++--- fs/smb/client/reparse.h | 6 +++--- fs/smb/client/smb2pdu.h | 1 + 3 files changed, 7 insertions(+), 6 deletions(-)
fs/smb/client/reparse.c +3 -3
@@ -1160,7 +1160,7 @@ static bool wsl_to_fattr(struct cifs_open_info_data *data, name = ea->ea_data; nlen = ea->ea_name_length; - v = (void *)((u8 *)ea->ea_data + ea->ea_name_length +1 ); + v = (void *)((u8 *)name + nlen +1 );if (!strncmp (name,SMB2_WSL_XATTR_UID , nlen)) fattr->cf_uid =wsl_make_kuid (cifs_sb, v);
@@ -1168,9 +1168,9 @@ static bool wsl_to_fattr(struct cifs_open_info_data *data, fattr->cf_gid =wsl_make_kgid (cifs_sb, v); else if (!strncmp(name, SMB2_WSL_XATTR_MODE, nlen)) {/* File type in reparse point tag and in xattr mode must match. */ -if (S_DT (fattr->cf_mode) !=S_DT (le32_to_cpu (*(__le32 *)v))) +if (S_DT (fattr->cf_mode) !=S_DT (get_unaligned_le32 (v)))return false; - fattr->cf_mode = (umode_t )le32_to_cpu (*(__le32 *)v); + fattr->cf_mode = (umode_t )get_unaligned_le32 (v); } else if (!strncmp(name, SMB2_WSL_XATTR_DEV, nlen)) { fattr->cf_rdev =reparse_mkdev (v); have_xattr_dev = true;
fs/smb/client/reparse.h +3 -3
@@ -23,7 +23,7 @@static inline dev_t reparse_mkdev (void *ptr) { -u64 v =le64_to_cpu (*(__le64 *)ptr); +u64 v =get_unaligned_le64 (ptr);return MKDEV (v &0xffffffff , v >>32 ); }
@@ -31,7 +31,7 @@ static inline dev_t reparse_mkdev(void *ptr)static inline kuid_t wsl_make_kuid (struct cifs_sb_info *cifs_sb,void *ptr) { -u32 uid =le32_to_cpu (*(__le32 *)ptr); +u32 uid =get_unaligned_le32 (ptr);if (cifs_sb_flags (cifs_sb) &CIFS_MOUNT_OVERR_UID )return cifs_sb->ctx->linux_uid;
@@ -41,7 +41,7 @@ static inline kuid_t wsl_make_kuid(struct cifs_sb_info *cifs_sb,static inline kgid_t wsl_make_kgid (struct cifs_sb_info *cifs_sb,void *ptr) { -u32 gid =le32_to_cpu (*(__le32 *)ptr); +u32 gid =get_unaligned_le32 (ptr);if (cifs_sb_flags (cifs_sb) &CIFS_MOUNT_OVERR_GID )return cifs_sb->ctx->linux_gid;
fs/smb/client/smb2pdu.h +1 -0
@@ -211,6 +211,7 @@ struct compress_ioctl {* BB consider moving to a different header */ +/* See MS-FSCC 2.4.16 */ struct smb2_file_full_ea_info {/* encoding of response for level 15 */ __le32 next_entry_offset;__u8 flags;
Signature · 1 line
2.53.0
Were you able to reproduce this bug with a test?
Quoted 92 lines · Youling Tang
From: Youling Tang <[email protected]>
See MS-FSCC 2.4.16. When multiple
FILE_FULL_EA_INFORMATIONdata elements are present in the buffer, each MUST be aligned on a 4-byte boundary.When parsing WSL extended attributes, the code derives the value pointer at an offset of 7 (
SMB2_WSL_XATTR_NAME_LEN+ 1) fromea_data, the value sits at an unaligned offset.We should use
get_unaligned_le32()orget_unaligned_le64()to get unaligned values.Signed-off-by Youling Tang <[email protected]>Reviewed-by ChenXiaoSong <[email protected]>--- fs/smb/client/reparse.c | 6 +++--- fs/smb/client/reparse.h | 6 +++--- fs/smb/client/smb2pdu.h | 1 + 3 files changed, 7 insertions(+), 6 deletions(-)fs/smb/client/reparse.c +3
-3@@ -1160,7 +1160,7 @@ static bool wsl_to_fattr(struct cifs_open_info_data *data, name = ea->ea_data; nlen = ea->ea_name_length; - v = (void *)((u8 *)ea->ea_data + ea->ea_name_length +1 ); + v = (void *)((u8 *)name + nlen +1 );if (!strncmp (name,SMB2_WSL_XATTR_UID , nlen)) fattr->cf_uid =wsl_make_kuid (cifs_sb, v);@@ -1168,9 +1168,9 @@ static bool wsl_to_fattr(struct cifs_open_info_data *data, fattr->cf_gid =wsl_make_kgid (cifs_sb, v); else if (!strncmp(name, SMB2_WSL_XATTR_MODE, nlen)) {/* File type in reparse point tag and in xattr mode must match. */ -if (S_DT (fattr->cf_mode) !=S_DT (le32_to_cpu (*(__le32 *)v))) +if (S_DT (fattr->cf_mode) !=S_DT (get_unaligned_le32 (v)))return false; - fattr->cf_mode = (umode_t )le32_to_cpu (*(__le32 *)v); + fattr->cf_mode = (umode_t )get_unaligned_le32 (v); } else if (!strncmp(name, SMB2_WSL_XATTR_DEV, nlen)) { fattr->cf_rdev =reparse_mkdev (v); have_xattr_dev = true;fs/smb/client/reparse.h +3
-3@@ -23,7 +23,7 @@static inline dev_t reparse_mkdev (void *ptr) { -u64 v =le64_to_cpu (*(__le64 *)ptr); +u64 v =get_unaligned_le64 (ptr);return MKDEV (v &0xffffffff , v >>32 ); }@@ -31,7 +31,7 @@ static inline dev_t reparse_mkdev(void *ptr)static inline kuid_t wsl_make_kuid (struct cifs_sb_info *cifs_sb,void *ptr) { -u32 uid =le32_to_cpu (*(__le32 *)ptr); +u32 uid =get_unaligned_le32 (ptr);if (cifs_sb_flags (cifs_sb) &CIFS_MOUNT_OVERR_UID )return cifs_sb->ctx->linux_uid;@@ -41,7 +41,7 @@ static inline kuid_t wsl_make_kuid(struct cifs_sb_info *cifs_sb,static inline kgid_t wsl_make_kgid (struct cifs_sb_info *cifs_sb,void *ptr) { -u32 gid =le32_to_cpu (*(__le32 *)ptr); +u32 gid =get_unaligned_le32 (ptr);if (cifs_sb_flags (cifs_sb) &CIFS_MOUNT_OVERR_GID )return cifs_sb->ctx->linux_gid;fs/smb/client/smb2pdu.h +1
-1@@ -211,6 +211,7 @@ struct compress_ioctl {* BB consider moving to a different header */ +/* See MS-FSCC 2.4.16 */ struct smb2_file_full_ea_info {/* encoding of response for level 15 */ __le32 next_entry_offset;__u8 flags; --2.53.0
Signature · 3 lines
Thanks, Steve
ChenXiaoSong
reviewerSome older architectures require strict alignment, we will set up virtual machine environments for testing.
Quoted 1 line · Steve French
Were you able to reproduce this bug with a test?