Skip to content

Commit 05e641b

Browse files
z00467499vijay-suman
authored andcommitted
cifs: Fix UAF in cifs_demultiplex_thread()
commit d527f51 upstream. There is a UAF when xfstests on cifs: BUG: KASAN: use-after-free in smb2_is_network_name_deleted+0x27/0x160 Read of size 4 at addr ffff88810103fc08 by task cifsd/923 CPU: 1 PID: 923 Comm: cifsd Not tainted 6.1.0-rc4+ #45 ... Call Trace: <TASK> dump_stack_lvl+0x34/0x44 print_report+0x171/0x472 kasan_report+0xad/0x130 kasan_check_range+0x145/0x1a0 smb2_is_network_name_deleted+0x27/0x160 cifs_demultiplex_thread.cold+0x172/0x5a4 kthread+0x165/0x1a0 ret_from_fork+0x1f/0x30 </TASK> Allocated by task 923: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_slab_alloc+0x54/0x60 kmem_cache_alloc+0x147/0x320 mempool_alloc+0xe1/0x260 cifs_small_buf_get+0x24/0x60 allocate_buffers+0xa1/0x1c0 cifs_demultiplex_thread+0x199/0x10d0 kthread+0x165/0x1a0 ret_from_fork+0x1f/0x30 Freed by task 921: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x40 ____kasan_slab_free+0x143/0x1b0 kmem_cache_free+0xe3/0x4d0 cifs_small_buf_release+0x29/0x90 SMB2_negotiate+0x8b7/0x1c60 smb2_negotiate+0x51/0x70 cifs_negotiate_protocol+0xf0/0x160 cifs_get_smb_ses+0x5fa/0x13c0 mount_get_conns+0x7a/0x750 cifs_mount+0x103/0xd00 cifs_smb3_do_mount+0x1dd/0xcb0 smb3_get_tree+0x1d5/0x300 vfs_get_tree+0x41/0xf0 path_mount+0x9b3/0xdd0 __x64_sys_mount+0x190/0x1d0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 The UAF is because: mount(pid: 921) | cifsd(pid: 923) -------------------------------|------------------------------- | cifs_demultiplex_thread SMB2_negotiate | cifs_send_recv | compound_send_recv | smb_send_rqst | wait_for_response | wait_event_state [1] | | standard_receive3 | cifs_handle_standard | handle_mid | mid->resp_buf = buf; [2] | dequeue_mid [3] KILL the process [4] | resp_iov[i].iov_base = buf | free_rsp_buf [5] | | is_network_name_deleted [6] | callback 1. After send request to server, wait the response until mid->mid_state != SUBMITTED; 2. Receive response from server, and set it to mid; 3. Set the mid state to RECEIVED; 4. Kill the process, the mid state already RECEIVED, get 0; 5. Handle and release the negotiate response; 6. UAF. It can be easily reproduce with add some delay in [3] - [6]. Only sync call has the problem since async call's callback is executed in cifsd process. Add an extra state to mark the mid state to READY before wakeup the waitter, then it can get the resp safely. Fixes: ec637e3 ("[CIFS] Avoid extra large buffer allocation (and memcpy) in cifs_readpages") Reviewed-by: Paulo Alcantara (SUSE) <[email protected]> Signed-off-by: Zhang Xiaoxu <[email protected]> Signed-off-by: Steve French <[email protected]> [fs/cifs was moved to fs/smb/client since 38c8a9a ("smb: move client and server files to common directory fs/smb"). We apply the patch to fs/cifs with some minor context changes.] Signed-off-by: He Zhe <[email protected]> Signed-off-by: Xiangyu Chen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit ed3b36f351d97dacb62cd0f399e8cf79f73bd30a) Signed-off-by: Vijayendra Suman <[email protected]>
1 parent 0562db4 commit 05e641b

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

fs/cifs/cifsglob.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,6 +1719,7 @@ static inline bool is_retryable_error(int error)
17191719
#define MID_RETRY_NEEDED 8 /* session closed while this request out */
17201720
#define MID_RESPONSE_MALFORMED 0x10
17211721
#define MID_SHUTDOWN 0x20
1722+
#define MID_RESPONSE_READY 0x40 /* ready for other process handle the rsp */
17221723

17231724
/* Flags */
17241725
#define MID_WAIT_CANCELLED 1 /* Cancelled while waiting for response */

fs/cifs/transport.c

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
void
3535
cifs_wake_up_task(struct mid_q_entry *mid)
3636
{
37+
if (mid->mid_state == MID_RESPONSE_RECEIVED)
38+
mid->mid_state = MID_RESPONSE_READY;
3739
wake_up_process(mid->callback_data);
3840
}
3941

@@ -86,7 +88,8 @@ static void _cifs_mid_q_entry_release(struct kref *refcount)
8688
struct TCP_Server_Info *server = midEntry->server;
8789

8890
if (midEntry->resp_buf && (midEntry->mid_flags & MID_WAIT_CANCELLED) &&
89-
midEntry->mid_state == MID_RESPONSE_RECEIVED &&
91+
(midEntry->mid_state == MID_RESPONSE_RECEIVED ||
92+
midEntry->mid_state == MID_RESPONSE_READY) &&
9093
server->ops->handle_cancelled_mid)
9194
server->ops->handle_cancelled_mid(midEntry, server);
9295

@@ -762,7 +765,8 @@ wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ)
762765
int error;
763766

764767
error = wait_event_freezekillable_unsafe(server->response_q,
765-
midQ->mid_state != MID_REQUEST_SUBMITTED);
768+
midQ->mid_state != MID_REQUEST_SUBMITTED &&
769+
midQ->mid_state != MID_RESPONSE_RECEIVED);
766770
if (error < 0)
767771
return -ERESTARTSYS;
768772

@@ -914,7 +918,7 @@ cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server)
914918

915919
spin_lock(&GlobalMid_Lock);
916920
switch (mid->mid_state) {
917-
case MID_RESPONSE_RECEIVED:
921+
case MID_RESPONSE_READY:
918922
spin_unlock(&GlobalMid_Lock);
919923
return rc;
920924
case MID_RETRY_NEEDED:
@@ -1013,6 +1017,9 @@ cifs_compound_callback(struct mid_q_entry *mid)
10131017
credits.instance = server->reconnect_instance;
10141018

10151019
add_credits(server, &credits, mid->optype);
1020+
1021+
if (mid->mid_state == MID_RESPONSE_RECEIVED)
1022+
mid->mid_state = MID_RESPONSE_READY;
10161023
}
10171024

10181025
static void
@@ -1204,7 +1211,8 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
12041211
send_cancel(server, &rqst[i], midQ[i]);
12051212
spin_lock(&GlobalMid_Lock);
12061213
midQ[i]->mid_flags |= MID_WAIT_CANCELLED;
1207-
if (midQ[i]->mid_state == MID_REQUEST_SUBMITTED) {
1214+
if (midQ[i]->mid_state == MID_REQUEST_SUBMITTED ||
1215+
midQ[i]->mid_state == MID_RESPONSE_RECEIVED) {
12081216
midQ[i]->callback = cifs_cancelled_callback;
12091217
cancelled_mid[i] = true;
12101218
credits[i].value = 0;
@@ -1225,7 +1233,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
12251233
}
12261234

12271235
if (!midQ[i]->resp_buf ||
1228-
midQ[i]->mid_state != MID_RESPONSE_RECEIVED) {
1236+
midQ[i]->mid_state != MID_RESPONSE_READY) {
12291237
rc = -EIO;
12301238
cifs_dbg(FYI, "Bad MID state?\n");
12311239
goto out;
@@ -1404,7 +1412,8 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
14041412
if (rc != 0) {
14051413
send_cancel(server, &rqst, midQ);
14061414
spin_lock(&GlobalMid_Lock);
1407-
if (midQ->mid_state == MID_REQUEST_SUBMITTED) {
1415+
if (midQ->mid_state == MID_REQUEST_SUBMITTED ||
1416+
midQ->mid_state == MID_RESPONSE_RECEIVED) {
14081417
/* no longer considered to be "in-flight" */
14091418
midQ->callback = DeleteMidQEntry;
14101419
spin_unlock(&GlobalMid_Lock);
@@ -1421,7 +1430,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
14211430
}
14221431

14231432
if (!midQ->resp_buf || !out_buf ||
1424-
midQ->mid_state != MID_RESPONSE_RECEIVED) {
1433+
midQ->mid_state != MID_RESPONSE_READY) {
14251434
rc = -EIO;
14261435
cifs_server_dbg(VFS, "Bad MID state?\n");
14271436
goto out;
@@ -1541,13 +1550,15 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15411550

15421551
/* Wait for a reply - allow signals to interrupt. */
15431552
rc = wait_event_interruptible(server->response_q,
1544-
(!(midQ->mid_state == MID_REQUEST_SUBMITTED)) ||
1553+
(!(midQ->mid_state == MID_REQUEST_SUBMITTED ||
1554+
midQ->mid_state == MID_RESPONSE_RECEIVED)) ||
15451555
((server->tcpStatus != CifsGood) &&
15461556
(server->tcpStatus != CifsNew)));
15471557

15481558
/* Were we interrupted by a signal ? */
15491559
if ((rc == -ERESTARTSYS) &&
1550-
(midQ->mid_state == MID_REQUEST_SUBMITTED) &&
1560+
(midQ->mid_state == MID_REQUEST_SUBMITTED ||
1561+
midQ->mid_state == MID_RESPONSE_RECEIVED) &&
15511562
((server->tcpStatus == CifsGood) ||
15521563
(server->tcpStatus == CifsNew))) {
15531564

@@ -1577,7 +1588,8 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15771588
if (rc) {
15781589
send_cancel(server, &rqst, midQ);
15791590
spin_lock(&GlobalMid_Lock);
1580-
if (midQ->mid_state == MID_REQUEST_SUBMITTED) {
1591+
if (midQ->mid_state == MID_REQUEST_SUBMITTED ||
1592+
midQ->mid_state == MID_RESPONSE_RECEIVED) {
15811593
/* no longer considered to be "in-flight" */
15821594
midQ->callback = DeleteMidQEntry;
15831595
spin_unlock(&GlobalMid_Lock);
@@ -1595,7 +1607,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon,
15951607
return rc;
15961608

15971609
/* rcvd frame is ok */
1598-
if (out_buf == NULL || midQ->mid_state != MID_RESPONSE_RECEIVED) {
1610+
if (out_buf == NULL || midQ->mid_state != MID_RESPONSE_READY) {
15991611
rc = -EIO;
16001612
cifs_tcon_dbg(VFS, "Bad MID state?\n");
16011613
goto out;

0 commit comments

Comments
 (0)