diff options
| author | Gordon Ross <gwr@racktopsystems.com> | 2021-12-01 12:03:24 -0500 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2022-10-14 22:56:00 +0300 |
| commit | a44ccde211b3554142d11535037f8ef996519c3b (patch) | |
| tree | eb9d5798f3540ee788608d8498b166c727a2bb88 | |
| parent | 5e1bbccc35c7d7d0b6abd200b510d8d5b99ae31c (diff) | |
| download | illumos-joyent-a44ccde211b3554142d11535037f8ef996519c3b.tar.gz | |
15044 SMB should return NT_STATUS_FS_DRIVER_REQUIRED for DFS ioctls when DFS is not supported
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Albert Lee <alee@racktopsystems.com>
Reviewed-by: Jerry Jelinek <gjelinek@racktopsystems.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Jason King <jason.brian.king+illumos@gmail.com>
Reviewed by: Matt Barden <mbarden@tintri.com>
Approved by: Dan McDonald <danmcd@mnx.io>
| -rw-r--r-- | usr/src/uts/common/fs/smbsrv/smb_dfs.c | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/smbsrv/smb_dfs.c b/usr/src/uts/common/fs/smbsrv/smb_dfs.c index a8a9817c24..ef199d4c8e 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_dfs.c +++ b/usr/src/uts/common/fs/smbsrv/smb_dfs.c @@ -23,6 +23,7 @@ * Use is subject to license terms. * * Copyright 2018 Nexenta Systems, Inc. All rights reserved. + * Copyright 2021 RackTop Systems, Inc. */ #include <smbsrv/smb_kproto.h> @@ -95,13 +96,26 @@ smb_dfs_fsctl(smb_request_t *sr, smb_fsctl_t *fsctl) if (!STYPE_ISIPC(sr->tid_tree->t_res_type)) return (NT_STATUS_INVALID_DEVICE_REQUEST); + /* + * If the connection is not DFS capable, we should return + * NT_STATUS_FS_DRIVER_REQUIRED for both of these DFS ioctls. + * See [MS-SMB2] 3.3.5.15.2. + */ + if ((sr->session->srv_cap & SMB2_CAP_DFS) == 0) + return (NT_STATUS_FS_DRIVER_REQUIRED); + switch (fsctl->CtlCode) { case FSCTL_DFS_GET_REFERRALS: status = smb_dfs_get_referrals(sr, fsctl); break; case FSCTL_DFS_GET_REFERRALS_EX: /* XXX - todo */ default: - status = NT_STATUS_NOT_SUPPORTED; + /* + * MS-SMB2 suggests INVALID_DEVICE_REQUEST + * for unknown control codes, but using that + * here makes Windows unhappy. + */ + status = NT_STATUS_FS_DRIVER_REQUIRED; } return (status); @@ -520,8 +534,25 @@ smb_dfs_referrals_get(smb_request_t *sr, char *dfs_path, dfs_reftype_t reftype, rc = smb_kdoor_upcall(sr->sr_server, SMB_DR_DFS_GET_REFERRALS, &req, dfs_referral_query_xdr, refrsp, dfs_referral_response_xdr); - if (rc != 0 || refrsp->rp_status != ERROR_SUCCESS) { + if (rc != 0) return (NT_STATUS_FS_DRIVER_REQUIRED); + + /* + * Map the Win error to one of the NT status codes + * documented in MS-DFSC. The most common, when we + * have no DFS root configured, is NOT_FOUND. + */ + switch (refrsp->rp_status) { + case ERROR_SUCCESS: + break; + case ERROR_INVALID_PARAMETER: + return (NT_STATUS_INVALID_PARAMETER); + case ERROR_NOT_ENOUGH_MEMORY: + return (NT_STATUS_INSUFFICIENT_RESOURCES); + case ERROR_NOT_FOUND: + return (NT_STATUS_NOT_FOUND); + default: + return (NT_STATUS_UNEXPECTED_NETWORK_ERROR); } (void) strsubst(refrsp->rp_referrals.i_uncpath, '/', '\\'); |