]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: libcli: Refuse to connect to any server with zero values for max_trans_size,...
authorJeremy Allison <jra@samba.org>
Tue, 21 Mar 2023 17:34:46 +0000 (10:34 -0700)
committerJule Anger <janger@samba.org>
Wed, 5 Apr 2023 14:08:23 +0000 (14:08 +0000)
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 <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Mar 29 18:58:33 UTC 2023 on atb-devel-224

(cherry picked from commit 76573d6d8f168d6e6107af26a434b8c71aaf93af)

Autobuild-User(v4-17-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-17-test): Wed Apr  5 14:08:23 UTC 2023 on sn-devel-184

libcli/smb/smbXcli_base.c
selftest/knownfail.d/smb2_zero_readsize [deleted file]

index c5d13bd58376e2d574a09c76eae09497f62338a3..1500d484e832580659890edfe81c3d560c8c7da5 100644 (file)
@@ -5088,6 +5088,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 (file)
index c7ec92c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.blackbox.zero_readsize.smb2_zero_readsize\(simpleserver:local\)