From: Ralph Boehme <slow@samba.org>
Date: Thu, 24 Oct 2024 17:35:00 +0000 (+0200)
Subject: libcli/smb: only copy the parent lease key if SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET... 
X-Git-Tag: tdb-1.4.13~675
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4cd3ab94ff5f5262f9e84ec7ccba53262d8ff7;p=thirdparty%2Fsamba.git

libcli/smb: only copy the parent lease key if SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET is set

MS-SMB2 3.3.5.9.11 Handling the SMB2_CREATE_REQUEST_LEASE_V2 Create Context:

  If the SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET bit is set in the Flags field of
  the request, Lease.ParentLeaseKey MUST be set to the ParentLeaseKey of the
  request.

Found by MS-SMB2-Prototocol-Testsuite test "Compare_Zero_LeaseFlag_ParentLeaseKey".

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/libcli/smb/smb2_lease.c b/libcli/smb/smb2_lease.c
index 442bdc60021..d28477b1911 100644
--- a/libcli/smb/smb2_lease.c
+++ b/libcli/smb/smb2_lease.c
@@ -52,9 +52,11 @@ ssize_t smb2_lease_pull(const uint8_t *buf, size_t len,
 	case 1:
 		break;
 	case 2:
-		memcpy(&lease->parent_lease_key, buf+32, 16);
 		lease->lease_flags = IVAL(buf, 20);
 		lease->lease_flags &= SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET;
+		if (lease->lease_flags & SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET) {
+			memcpy(&lease->parent_lease_key, buf+32, 16);
+		}
 		lease->lease_duration = BVAL(buf, 24);
 		lease->lease_epoch = SVAL(buf, 48);
 		break;
diff --git a/selftest/knownfail.d/samba3.smb2.lease b/selftest/knownfail.d/samba3.smb2.lease
deleted file mode 100644
index c3084dc5ad2..00000000000
--- a/selftest/knownfail.d/samba3.smb2.lease
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.lease.v2_flags_parentkey\(fileserver\)