11658 Some capabilities are invalid for SMB 2.002

Review Request #2281 — Created Sept. 5, 2019 and submitted Sept. 30, 2019, 11:47 a.m.

Information
Owner:	andy_js
Repository:	illumos-gate
Branch:
Bugs:	11658
Depends On:
Reviewers
Groups:	general
People:

Description

Uncovered by the Windows Protocol Test Suite: SMB2_GLOBAL_CAP_LEASING and SMB2_GLOBAL_CAP_LARGE_MTU and not valid for SMB 2.002 but we set them anyway.

Testing Done

These capabilities were causing an assert to trip in the Windows Protocol Test Suite code. Removing them allows the tests to pass.

Testing Done:

~		More tests pass as a result of this change.
	~	These capabilities were causing an assert to trip in the Windows Protocol Test Suite code. Removing them allows the tests to pass.

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

usr/src/uts/common/fs/smbsrv/smb2_negotiate.c (Diff revision 1)

OK, but how about introducing another macro, e.g. SMB_20_CAPS right below SMB_2X_CAPS so these are

described in the same place? (top of this file)
I'd then also suggest an if/else structure like:

if (dialect < SMB_VERS_2_1) {
    s->srv_cap = smb2srv_capabilities & SMB_20_CAPS;
} else if (dialect < SMB_VERS_3_0) {
    (... code as before...)
} else ...

andy_js Sept. 5, 2019, 2:40 p.m.

SMB_20_CAPS would be an alias for SMB2_CAP_DFS in this case since it's the only capability supported by SMB 2.02. If feel like it's better to treat it like a special case. Do you still want me to change it?

gwr Sept. 5, 2019, 2:44 p.m.

I guess there's no need for an alias then.
I'd still like the logic change if you don't mind.

gwr Sept. 5, 2019, 2:46 p.m.

One thing that might not have been obvious is that smb2srv_capabilities was designed to be patchable for testing with some capabilities suppressed. Do you think that needs a comment above that initialization?

andy_js Sept. 5, 2019, 4:09 p.m.

I added a comment even though I think it's pretty clear.