Print this page
NEX-1643 dtrace provider for smbsrv
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
NEX-8495 Panic after SMB flush on a named pipe
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
SMB-122 smbd core dumps in smbd_dc_update / smb_log
SMB-117 Win7 fails to open security properties
SMB-11 SMB2 message parse & dispatch
SMB-12 SMB2 Negotiate Protocol
SMB-13 SMB2 Session Setup
SMB-14 SMB2 Logoff
SMB-15 SMB2 Tree Connect
SMB-16 SMB2 Tree Disconnect
SMB-17 SMB2 Create
SMB-18 SMB2 Close
SMB-19 SMB2 Flush
SMB-20 SMB2 Read
SMB-21 SMB2 Write
SMB-22 SMB2 Lock/Unlock
SMB-23 SMB2 Ioctl
SMB-24 SMB2 Cancel
SMB-25 SMB2 Echo
SMB-26 SMB2 Query Dir
SMB-27 SMB2 Change Notify
SMB-28 SMB2 Query Info
SMB-29 SMB2 Set Info
SMB-30 SMB2 Oplocks
SMB-53 SMB2 Create Context options
(SMB2 code review cleanup 1, 2, 3)
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/fs/smbsrv/smb2_flush.c
+++ new/usr/src/uts/common/fs/smbsrv/smb2_flush.c
1 1 /*
2 2 * This file and its contents are supplied under the terms of the
|
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
3 3 * Common Development and Distribution License ("CDDL"), version 1.0.
4 4 * You may only use this file in accordance with the terms of version
5 5 * 1.0 of the CDDL.
6 6 *
7 7 * A full copy of the text of the CDDL should have accompanied this
8 8 * source. A copy of the CDDL is also available via the Internet at
9 9 * http://www.illumos.org/license/CDDL.
10 10 */
11 11
12 12 /*
13 - * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
13 + * Copyright 2017 Nexenta Systems, Inc. All rights reserved.
14 14 * Copyright 2016 Syneto S.R.L. All rights reserved.
15 15 */
16 16
17 17 /*
18 18 * Dispatch function for SMB2_FLUSH
19 19 */
20 20
21 21 #include <smbsrv/smb2_kproto.h>
22 22 #include <smbsrv/smb_fsops.h>
23 23
24 24 smb_sdrc_t
|
↓ open down ↓ |
1 lines elided |
↑ open up ↑ |
25 25 smb2_flush(smb_request_t *sr)
26 26 {
27 27 uint16_t StructSize;
28 28 uint16_t reserved1;
29 29 uint32_t reserved2;
30 30 smb2fid_t smb2fid;
31 31 uint32_t status;
32 32 int rc = 0;
33 33
34 34 /*
35 - * SMB2 Flush request
35 + * Decode SMB2 Flush request
36 36 */
37 37 rc = smb_mbc_decodef(
38 38 &sr->smb_data, "wwlqq",
39 39 &StructSize, /* w */
40 40 &reserved1, /* w */
41 41 &reserved2, /* l */
42 42 &smb2fid.persistent, /* q */
43 43 &smb2fid.temporal); /* q */
44 - if (rc)
44 + if (rc || StructSize != 24)
45 45 return (SDRC_ERROR);
46 - if (StructSize != 24)
47 - return (SDRC_ERROR);
48 46
47 + /*
48 + * Want FID lookup before the start probe.
49 + */
49 50 status = smb2sr_lookup_fid(sr, &smb2fid);
51 + DTRACE_SMB2_START(op__Flush, smb_request_t *, sr);
52 +
53 + if (status == 0)
54 + smb_ofile_flush(sr, sr->fid_ofile);
55 +
56 + sr->smb2_status = status;
57 + DTRACE_SMB2_DONE(op__Flush, smb_request_t *, sr);
58 +
50 59 if (status) {
51 60 smb2sr_put_error(sr, status);
52 61 return (SDRC_SUCCESS);
53 62 }
54 63
55 - smb_ofile_flush(sr, sr->fid_ofile);
56 -
57 64 /*
58 65 * SMB2 Flush reply
59 66 */
60 67 (void) smb_mbc_encodef(
61 68 &sr->reply, "wwl",
62 69 4, /* StructSize */ /* w */
63 70 0); /* reserved */ /* w */
64 71
65 72 return (SDRC_SUCCESS);
66 73 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX