From 41b57d181d0b4df0badc148a4769e9d0bf008aaa Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Wed, 25 Nov 2020 18:51:29 +0000 Subject: 13337 ctfconvert should skip ssp_ns.c when checking for debug data Reviewed by: Robert Mustacchi Reviewed by: Igor Kozhukhov Approved by: Gordon Ross --- usr/src/lib/libctf/common/ctf_dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr/src/lib/libctf/common/ctf_dwarf.c b/usr/src/lib/libctf/common/ctf_dwarf.c index d91888d6c1..1618c8add4 100644 --- a/usr/src/lib/libctf/common/ctf_dwarf.c +++ b/usr/src/lib/libctf/common/ctf_dwarf.c @@ -3288,6 +3288,7 @@ c_source_has_debug(const char *file, ctf_cu_t *cus, size_t nr_cus) strcmp(basename, "gmon.c") == 0 || strcmp(basename, "dlink_init.c") == 0 || strcmp(basename, "dlink_common.c") == 0 || + strcmp(basename, "ssp_ns.c") == 0 || strncmp(basename, "crt", strlen("crt")) == 0 || strncmp(basename, "values-", strlen("values-")) == 0) return (B_TRUE); -- cgit v1.2.3 From 4d2aba2f17eed4643aa996841698226ff2673205 Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Mon, 23 Nov 2020 19:51:44 -0500 Subject: 13330 SMB read hangs on Mac Big Sur Reviewed by: Robert Mustacchi Reviewed by: Paul Winder Reviewed by: Andy Fiddaman Reviewed by: Matt Barden Approved by: Richard Lowe --- usr/src/uts/common/fs/smbsrv/smb2_read.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/usr/src/uts/common/fs/smbsrv/smb2_read.c b/usr/src/uts/common/fs/smbsrv/smb2_read.c index f8c91c878f..936fa06f6c 100644 --- a/usr/src/uts/common/fs/smbsrv/smb2_read.c +++ b/usr/src/uts/common/fs/smbsrv/smb2_read.c @@ -10,11 +10,12 @@ */ /* - * Copyright 2019 Nexenta Systems, Inc. All rights reserved. + * Copyright 2020 Tintri by DDN, Inc. All rights reserved. */ /* * Dispatch function for SMB2_READ + * MS-SMB2 sec. 3.3.5.12 */ #include @@ -159,6 +160,14 @@ smb2_read(smb_request_t *sr) smb_mbuf_trim(m, XferCount); MBC_ATTACH_MBUF(&sr->raw_data, m); + /* + * [MS-SMB2] If the read returns fewer bytes than specified by + * the MinimumCount field of the request, the server MUST fail + * the request with STATUS_END_OF_FILE + */ + if (status == 0 && XferCount < MinCount) + status = NT_STATUS_END_OF_FILE; + /* * Checking the error return _after_ dealing with * the returned data so that if m was allocated, -- cgit v1.2.3