]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: add bounds check for create lease context
authorNorbert Szetei <norbert@doyensec.com>
Sat, 15 Mar 2025 03:19:28 +0000 (12:19 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:33:42 +0000 (14:33 +0200)
commit bab703ed8472aa9d109c5f8c1863921533363dae upstream.

Add missing bounds check for create lease context.

Cc: stable@vger.kernel.org
Reported-by: Norbert Szetei <norbert@doyensec.com>
Tested-by: Norbert Szetei <norbert@doyensec.com>
Signed-off-by: Norbert Szetei <norbert@doyensec.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/smb/server/oplock.c

index b29e78b517bf01bd647434432990ee9b68b531fc..a3c016a11e2715702f95fe71f98d8651d79d9147 100644 (file)
@@ -1534,6 +1534,10 @@ struct lease_ctx_info *parse_lease_state(void *open_req, bool is_dir)
        if (sizeof(struct lease_context_v2) == le32_to_cpu(cc->DataLength)) {
                struct create_lease_v2 *lc = (struct create_lease_v2 *)cc;
 
+               if (le16_to_cpu(cc->DataOffset) + le32_to_cpu(cc->DataLength) <
+                   sizeof(struct create_lease_v2) - 4)
+                       return NULL;
+
                memcpy(lreq->lease_key, lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE);
                if (is_dir) {
                        lreq->req_state = lc->lcontext.LeaseState &
@@ -1551,6 +1555,10 @@ struct lease_ctx_info *parse_lease_state(void *open_req, bool is_dir)
        } else {
                struct create_lease *lc = (struct create_lease *)cc;
 
+               if (le16_to_cpu(cc->DataOffset) + le32_to_cpu(cc->DataLength) <
+                   sizeof(struct create_lease))
+                       return NULL;
+
                memcpy(lreq->lease_key, lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE);
                lreq->req_state = lc->lcontext.LeaseState;
                lreq->flags = lc->lcontext.LeaseFlags;