Skip to content

Commit f29a890

Browse files
Paulo Alcantaraaahmed71
authored andcommitted
smb: client: fix UAF in smb2_reconnect_server()
commit 24a9799 upstream. The UAF bug is due to smb2_reconnect_server() accessing a session that is already being teared down by another thread that is executing __cifs_put_smb_ses(). This can happen when (a) the client has connection to the server but no session or (b) another thread ends up setting @ses->ses_status again to something different than SES_EXITING. To fix this, we need to make sure to unconditionally set @ses->ses_status to SES_EXITING and prevent any other threads from setting a new status while we're still tearing it down. The following can be reproduced by adding some delay to right after the ipc is freed in __cifs_put_smb_ses() - which will give smb2_reconnect_server() worker a chance to run and then accessing @ses->ipc: kinit ... mount.cifs //srv/share /mnt/1 -o sec=krb5,nohandlecache,echo_interval=10 [disconnect srv] ls /mnt/1 &>/dev/null sleep 30 kdestroy [reconnect srv] sleep 10 umount /mnt/1 ... CIFS: VFS: Verify user has a krb5 ticket and keyutils is installed CIFS: VFS: \\srv Send error in SessSetup = -126 CIFS: VFS: Verify user has a krb5 ticket and keyutils is installed CIFS: VFS: \\srv Send error in SessSetup = -126 general protection fault, probably for non-canonical address 0x6b6b6b6b6b6b6b6b: 0000 [#1] PREEMPT SMP NOPTI CPU: 3 PID: 50 Comm: kworker/3:1 Not tainted 6.9.0-rc2 #1 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-1.fc39 04/01/2014 Workqueue: cifsiod smb2_reconnect_server [cifs] RIP: 0010:__list_del_entry_valid_or_report+0x33/0xf0 Code: 4f 08 48 85 d2 74 42 48 85 c9 74 59 48 b8 00 01 00 00 00 00 ad de 48 39 c2 74 61 48 b8 22 01 00 00 00 00 74 69 <48> 8b 01 48 39 f8 75 7b 48 8b 72 08 48 39 c6 0f 85 88 00 00 00 b8 RSP: 0018:ffffc900001bfd70 EFLAGS: 00010a83 RAX: dead000000000122 RBX: ffff88810da53838 RCX: 6b6b6b6b6b6b6b6b RDX: 6b6b6b6b6b6b6b6b RSI: ffffffffc02f6878 RDI: ffff88810da53800 RBP: ffff88810da53800 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: ffff88810c064000 R13: 0000000000000001 R14: ffff88810c064000 R15: ffff8881039cc000 FS: 0000000000000000(0000) GS:ffff888157c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fe3728b1000 CR3: 000000010caa4000 CR4: 0000000000750ef0 PKRU: 55555554 Call Trace: <TASK> ? die_addr+0x36/0x90 ? exc_general_protection+0x1c1/0x3f0 ? asm_exc_general_protection+0x26/0x30 ? __list_del_entry_valid_or_report+0x33/0xf0 __cifs_put_smb_ses+0x1ae/0x500 [cifs] smb2_reconnect_server+0x4ed/0x710 [cifs] process_one_work+0x205/0x6b0 worker_thread+0x191/0x360 ? __pfx_worker_thread+0x10/0x10 kthread+0xe2/0x110 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x34/0x50 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1a/0x30 </TASK> Cc: stable@vger.kernel.org Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com> [v5.15: added ses_lock to cifs_ses; used ses->status and old statusEnum values; resolved contextual conflicts in cifs_put_smb_ses] Signed-off-by: Shaoying Xu <shaoyi@amazon.com>
1 parent 90ead50 commit f29a890

File tree

2 files changed

+36
-41
lines changed

2 files changed

+36
-41
lines changed

fs/cifs/cifsglob.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ struct cifs_ses {
916916
struct list_head smb_ses_list;
917917
struct list_head tcon_list;
918918
struct cifs_tcon *tcon_ipc;
919+
spinlock_t ses_lock; /* protect anything here that is not protected */
919920
struct mutex session_mutex;
920921
struct TCP_Server_Info *server; /* pointer to server info */
921922
int ses_count; /* reference counter */

fs/cifs/connect.c

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,13 @@ static void cifs_mark_tcp_ses_conns_for_reconnect(struct TCP_Server_Info *server
193193
spin_lock(&cifs_tcp_ses_lock);
194194
list_for_each(tmp, &pserver->smb_ses_list) {
195195
ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
196+
spin_lock(&ses->ses_lock);
197+
if (ses->status == CifsExiting) {
198+
spin_unlock(&ses->ses_lock);
199+
continue;
200+
}
201+
spin_unlock(&ses->ses_lock);
202+
196203
spin_lock(&ses->chan_lock);
197204
if (cifs_chan_needs_reconnect(ses, server))
198205
goto next_session;
@@ -1717,31 +1724,6 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb3_fs_context *ctx)
17171724
return rc;
17181725
}
17191726

1720-
/**
1721-
* cifs_free_ipc - helper to release the session IPC tcon
1722-
* @ses: smb session to unmount the IPC from
1723-
*
1724-
* Needs to be called everytime a session is destroyed.
1725-
*
1726-
* On session close, the IPC is closed and the server must release all tcons of the session.
1727-
* No need to send a tree disconnect here.
1728-
*
1729-
* Besides, it will make the server to not close durable and resilient files on session close, as
1730-
* specified in MS-SMB2 3.3.5.6 Receiving an SMB2 LOGOFF Request.
1731-
*/
1732-
static int
1733-
cifs_free_ipc(struct cifs_ses *ses)
1734-
{
1735-
struct cifs_tcon *tcon = ses->tcon_ipc;
1736-
1737-
if (tcon == NULL)
1738-
return 0;
1739-
1740-
tconInfoFree(tcon);
1741-
ses->tcon_ipc = NULL;
1742-
return 0;
1743-
}
1744-
17451727
static struct cifs_ses *
17461728
cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx)
17471729
{
@@ -1766,34 +1748,46 @@ void cifs_put_smb_ses(struct cifs_ses *ses)
17661748
unsigned int rc, xid;
17671749
unsigned int chan_count;
17681750
struct TCP_Server_Info *server = ses->server;
1769-
cifs_dbg(FYI, "%s: ses_count=%d\n", __func__, ses->ses_count);
1770-
1771-
spin_lock(&cifs_tcp_ses_lock);
1772-
if (ses->status == CifsExiting) {
1773-
spin_unlock(&cifs_tcp_ses_lock);
1774-
return;
1775-
}
1751+
struct cifs_tcon *tcon;
1752+
bool do_logoff;
17761753

17771754
cifs_dbg(FYI, "%s: ses_count=%d\n", __func__, ses->ses_count);
1778-
cifs_dbg(FYI, "%s: ses ipc: %s\n", __func__, ses->tcon_ipc ? ses->tcon_ipc->treeName : "NONE");
17791755

1780-
if (--ses->ses_count > 0) {
1756+
spin_lock(&cifs_tcp_ses_lock);
1757+
spin_lock(&ses->ses_lock);
1758+
cifs_dbg(FYI, "%s: id=0x%llx ses_count=%d ses_status=%u ipc=%s\n",
1759+
__func__, ses->Suid, ses->ses_count, ses->status,
1760+
ses->tcon_ipc ? ses->tcon_ipc->treeName : "none");
1761+
if (ses->status == CifsExiting || --ses->ses_count > 0) {
1762+
spin_unlock(&ses->ses_lock);
17811763
spin_unlock(&cifs_tcp_ses_lock);
17821764
return;
17831765
}
1784-
spin_unlock(&cifs_tcp_ses_lock);
17851766

17861767
/* ses_count can never go negative */
17871768
WARN_ON(ses->ses_count < 0);
17881769

1789-
spin_lock(&GlobalMid_Lock);
1790-
if (ses->status == CifsGood)
1791-
ses->status = CifsExiting;
1792-
spin_unlock(&GlobalMid_Lock);
1770+
spin_lock(&ses->chan_lock);
1771+
cifs_chan_clear_need_reconnect(ses, server);
1772+
spin_unlock(&ses->chan_lock);
17931773

1794-
cifs_free_ipc(ses);
1774+
do_logoff = ses->status == CifsGood && server->ops->logoff;
1775+
ses->status = CifsExiting;
1776+
tcon = ses->tcon_ipc;
1777+
ses->tcon_ipc = NULL;
1778+
spin_unlock(&ses->ses_lock);
1779+
spin_unlock(&cifs_tcp_ses_lock);
17951780

1796-
if (ses->status == CifsExiting && server->ops->logoff) {
1781+
/*
1782+
* On session close, the IPC is closed and the server must release all
1783+
* tcons of the session. No need to send a tree disconnect here.
1784+
*
1785+
* Besides, it will make the server to not close durable and resilient
1786+
* files on session close, as specified in MS-SMB2 3.3.5.6 Receiving an
1787+
* SMB2 LOGOFF Request.
1788+
*/
1789+
tconInfoFree(tcon);
1790+
if (do_logoff) {
17971791
xid = get_xid();
17981792
rc = server->ops->logoff(xid, ses);
17991793
if (rc)

0 commit comments

Comments
 (0)