From e59e9eadd0e86126c56107be08c2f5b25c6bc484 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 21 Mar 2023 10:34:46 -0700 Subject: s3: libcli: Refuse to connect to any server with zero values for max_trans_size, max_read_size, max_write_size. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's nothing we can do to such a server (this now matches the behavior for SMB1). Remove knownfail. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15306 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Wed Mar 29 18:58:33 UTC 2023 on atb-devel-224 (cherry picked from commit 76573d6d8f168d6e6107af26a434b8c71aaf93af) --- libcli/smb/smbXcli_base.c | 11 +++++++++++ selftest/knownfail.d/smb2_zero_readsize | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) delete mode 100644 selftest/knownfail.d/smb2_zero_readsize diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index aaf2d405a94..a2a551d0f79 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -5128,6 +5128,17 @@ static void smbXcli_negprot_smb2_done(struct tevent_req *subreq) conn->smb2.server.system_time = BVAL(body, 40); conn->smb2.server.start_time = BVAL(body, 48); + if (conn->smb2.server.max_trans_size == 0 || + conn->smb2.server.max_read_size == 0 || + conn->smb2.server.max_write_size == 0) { + /* + * We can't connect to servers we can't + * do any operations on. + */ + tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); + return; + } + security_offset = SVAL(body, 56); security_length = SVAL(body, 58); diff --git a/selftest/knownfail.d/smb2_zero_readsize b/selftest/knownfail.d/smb2_zero_readsize deleted file mode 100644 index c7ec92cd629..00000000000 --- a/selftest/knownfail.d/smb2_zero_readsize +++ /dev/null @@ -1 +0,0 @@ -^samba3.blackbox.zero_readsize.smb2_zero_readsize\(simpleserver:local\) -- cgit v1.2.1