diff options
| author | Gordon Ross <gwr@nexenta.com> | 2019-11-12 11:15:53 -0500 |
|---|---|---|
| committer | Gordon Ross <gordon.ross@tintri.com> | 2021-02-20 15:36:57 -0500 |
| commit | 174aa483b26ab13af096f2d478f7c15afdaf9784 (patch) | |
| tree | 0580ef4e7816a60f1b712c0ccb20eaa54d6a74e6 | |
| parent | 8bf842e01303492318712f55e3f715097c4df992 (diff) | |
| download | illumos-joyent-174aa483b26ab13af096f2d478f7c15afdaf9784.tar.gz | |
13514 smbsrv panic in smb2_dh_read_nvlist
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Paul Winder <paul@winder.uk.net>
Approved by: Robert Mustacchi <rm@fingolfin.org>
| -rw-r--r-- | usr/src/uts/common/fs/smbsrv/smb2_durable.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/smbsrv/smb2_durable.c b/usr/src/uts/common/fs/smbsrv/smb2_durable.c index 56dda62832..2e68090ed4 100644 --- a/usr/src/uts/common/fs/smbsrv/smb2_durable.c +++ b/usr/src/uts/common/fs/smbsrv/smb2_durable.c @@ -10,7 +10,7 @@ */ /* - * Copyright 2018 Nexenta Systems, Inc. All rights reserved. + * Copyright 2019 Nexenta by DDN, Inc. All rights reserved. */ /* @@ -813,7 +813,7 @@ smb2_dh_read_nvlist(smb_request_t *sr, smb_node_t *node, smb_attr_t attr; iovec_t iov; uio_t uio; - smb_kshare_t *shr = sr->arg.tcon.si; + smb_tree_t *tree = sr->tid_tree; cred_t *kcr = zone_kcred(); size_t flen; int rc; @@ -823,14 +823,14 @@ smb2_dh_read_nvlist(smb_request_t *sr, smb_node_t *node, rc = smb_node_getattr(NULL, node, kcr, NULL, &attr); if (rc != 0) { cmn_err(CE_NOTE, "CA import (%s/%s) getattr rc=%d", - shr->shr_path, node->od_name, rc); + tree->t_resource, node->od_name, rc); return (rc); } if (attr.sa_vattr.va_size < 4 || attr.sa_vattr.va_size > sr->sr_req_length) { cmn_err(CE_NOTE, "CA import (%s/%s) bad size=%" PRIu64, - shr->shr_path, node->od_name, + tree->t_resource, node->od_name, (uint64_t)attr.sa_vattr.va_size); return (EINVAL); } @@ -847,19 +847,19 @@ smb2_dh_read_nvlist(smb_request_t *sr, smb_node_t *node, rc = smb_fsop_read(sr, kcr, node, NULL, &uio, 0); if (rc != 0) { cmn_err(CE_NOTE, "CA import (%s/%s) read, rc=%d", - shr->shr_path, node->od_name, rc); + tree->t_resource, node->od_name, rc); return (rc); } if (uio.uio_resid != 0) { cmn_err(CE_NOTE, "CA import (%s/%s) short read", - shr->shr_path, node->od_name); + tree->t_resource, node->od_name); return (EIO); } rc = nvlist_unpack(sr->sr_request_buf, flen, nvlpp, KM_SLEEP); if (rc != 0) { cmn_err(CE_NOTE, "CA import (%s/%s) unpack, rc=%d", - shr->shr_path, node->od_name, rc); + tree->t_resource, node->od_name, rc); return (rc); } |