diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-10-30 23:34:48 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-10-30 23:34:48 -0400 |
| commit | 95c2a7d60701668efed9d53aa153487d0c7b1655 (patch) | |
| tree | 1ac6fe3e7f97afed100dbbf7591a8387e1bce2a9 /usr/src/uts/common | |
| parent | f9f763d5983af381d2f56185852d90f603d519a6 (diff) | |
| parent | f117aa50f60d0a3e62bfa8cbddecd855d648a464 (diff) | |
| download | illumos-joyent-95c2a7d60701668efed9d53aa153487d0c7b1655.tar.gz | |
[illumos-gate merge]
commit f117aa50f60d0a3e62bfa8cbddecd855d648a464
15130 Update tzdata to 2022f
commit cf56021bf3bfd6c5c3b246414ea6e6edfee73f49
15094 WPTS BVT_SMB2Basic_Query_FileAllInformation
Conflicts:
manifest
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/fs/smbsrv/smb2_qinfo_file.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/smbsrv/smb2_qinfo_file.c b/usr/src/uts/common/fs/smbsrv/smb2_qinfo_file.c index 929f02522b..00198aa31f 100644 --- a/usr/src/uts/common/fs/smbsrv/smb2_qinfo_file.c +++ b/usr/src/uts/common/fs/smbsrv/smb2_qinfo_file.c @@ -11,6 +11,7 @@ /* * Copyright 2019 Nexenta by DDN, Inc. All rights reserved. + * Copyright 2022 RackTop Systems, Inc. */ /* @@ -72,7 +73,10 @@ smb2_qinfo_file(smb_request_t *sr, smb_queryinfo_t *qi) case FileAllInformation: mask = SMB_AT_ALL; getstd = B_TRUE; - getname = B_TRUE; + if (sr->session->dialect < SMB_VERS_3_11) { + /* See smb2_qif_all() */ + getname = B_TRUE; + } break; case FileNameInformation: @@ -196,6 +200,8 @@ smb2_qinfo_file(smb_request_t *sr, smb_queryinfo_t *qi) * FileModeInformation * FileAlignmentInformation * FileNameInformation + * + * Note: FileNameInformation is all zero on Win2016 and later. */ static uint32_t smb2_qif_all(smb_request_t *sr, smb_queryinfo_t *qi) @@ -223,11 +229,24 @@ smb2_qif_all(smb_request_t *sr, smb_queryinfo_t *qi) status = smb2_qif_alignment(sr, qi); if (status) return (status); - status = smb2_qif_name(sr, qi); - if (status) - return (status); - return (0); + /* + * MS-SMB2 3.3.5.20.1 says (in a windows behavior note) that + * 2012R2 and older fill in the FileNameInformation. + * We could let this depend on sr->sr_cfg->skc_version + * but doing it based on dialect is a lot easier and + * has nearly the same effect. + */ + if (sr->session->dialect < SMB_VERS_3_11) { + /* Win2012r2 and earlier fill it in. (SMB 3.0) */ + status = smb2_qif_name(sr, qi); + } else { + /* Win2016 and later just put zeros (SMB 3.11) */ + int rc = smb_mbc_encodef(&sr->raw_data, "10."); + status = (rc == 0) ? 0 : NT_STATUS_BUFFER_OVERFLOW; + } + + return (status); } /* |