projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a3eb33
)
cifs: Fix use-after-free in SMB2_read
author
ZhangXiaoxu
<zhangxiaoxu5@huawei.com>
Sat, 6 Apr 2019 07:47:39 +0000
(15:47 +0800)
committer
Steve French
<stfrench@microsoft.com>
Tue, 16 Apr 2019 14:38:21 +0000
(09:38 -0500)
There is a KASAN use-after-free:
BUG: KASAN: use-after-free in SMB2_read+0x1136/0x1190
Read of size 8 at addr
ffff8880b4e45e50
by task ln/1009
Should not release the 'req' because it will use in the trace.
Fixes: eccb4422cf97 ("smb3: Add ftrace tracepoints for improved SMB3 debugging")
Signed-off-by: ZhangXiaoxu <zhangxiaoxu5@huawei.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org> 4.18+
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
fs/cifs/smb2pdu.c
patch
|
blob
|
history
diff --git
a/fs/cifs/smb2pdu.c
b/fs/cifs/smb2pdu.c
index 5d1f8d2d44e432399ba3573fd1904cb65c372fb5..5d6adc63ad621df49b9982677385001bd0b09ac1 100644
(file)
--- a/
fs/cifs/smb2pdu.c
+++ b/
fs/cifs/smb2pdu.c
@@
-3448,8
+3448,6
@@
SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
rqst.rq_nvec = 1;
rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
- cifs_small_buf_release(req);
-
rsp = (struct smb2_read_rsp *)rsp_iov.iov_base;
if (rc) {
@@
-3471,6
+3469,8
@@
SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
io_parms->tcon->tid, ses->Suid,
io_parms->offset, io_parms->length);
+ cifs_small_buf_release(req);
+
*nbytes = le32_to_cpu(rsp->DataLength);
if ((*nbytes > CIFS_MAX_MSGSIZE) ||
(*nbytes > io_parms->length)) {