You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
1.8 KiB
63 lines
1.8 KiB
From 5b2d738fb3e5d40590261702a8e7564a5b0e46d5 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Allison <jra@samba.org>
|
|
Date: Tue, 19 Sep 2017 16:11:33 -0700
|
|
Subject: [PATCH] s3: smbd: Fix SMB1 use-after-free crash bug. CVE-2017-14746
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When setting up the chain, always use 'next->' variables
|
|
not the 'req->' one.
|
|
|
|
Bug discovered by 连一汉 <lianyihan@360.cn>
|
|
|
|
CVE-2017-14746
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13041
|
|
|
|
Signed-off-by: Jeremy Allison <jra@samba.org>
|
|
---
|
|
source3/smbd/process.c | 7 ++++---
|
|
source3/smbd/reply.c | 5 +++++
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
|
|
index b65ae2c1b1c..9b2b0a669a2 100644
|
|
--- a/source3/smbd/process.c
|
|
+++ b/source3/smbd/process.c
|
|
@@ -1855,12 +1855,13 @@ void smb_request_done(struct smb_request *req)
|
|
|
|
next->vuid = SVAL(req->outbuf, smb_uid);
|
|
next->tid = SVAL(req->outbuf, smb_tid);
|
|
- status = smb1srv_tcon_lookup(req->xconn, req->tid,
|
|
+ status = smb1srv_tcon_lookup(req->xconn, next->tid,
|
|
now, &tcon);
|
|
+
|
|
if (NT_STATUS_IS_OK(status)) {
|
|
- req->conn = tcon->compat;
|
|
+ next->conn = tcon->compat;
|
|
} else {
|
|
- req->conn = NULL;
|
|
+ next->conn = NULL;
|
|
}
|
|
next->chain_fsp = req->chain_fsp;
|
|
next->inbuf = req->inbuf;
|
|
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
|
|
index 7b07078249b..81acedf0413 100644
|
|
--- a/source3/smbd/reply.c
|
|
+++ b/source3/smbd/reply.c
|
|
@@ -923,6 +923,11 @@ void reply_tcon_and_X(struct smb_request *req)
|
|
}
|
|
|
|
TALLOC_FREE(tcon);
|
|
+ /*
|
|
+ * This tree id is gone. Make sure we can't re-use it
|
|
+ * by accident.
|
|
+ */
|
|
+ req->tid = 0;
|
|
}
|
|
|
|
if ((passlen > MAX_PASS_LEN) || (passlen >= req->buflen)) {
|
|
--
|
|
2.14.2.920.gcf0c67979c-goog
|
|
|
|
|