Skip to content

Commit 6011ebc

Browse files
Paulo Alcantaranathan-zcgao
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> [v4.14: added ses_lock to cifs_ses; used ses->status and old statusEnum values; resolved contextual conflicts in cifs_put_smb_ses] Signed-off-by: Jay Wang <wanjay@amazon.com>
1 parent 9438d6c commit 6011ebc

File tree

2 files changed

+26
-38
lines changed

2 files changed

+26
-38
lines changed

fs/cifs/cifsglob.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,7 @@ struct cifs_ses {
826826
struct list_head smb_ses_list;
827827
struct list_head tcon_list;
828828
struct cifs_tcon *tcon_ipc;
829+
spinlock_t ses_lock; /* protect anything here that is not protected */
829830
struct mutex session_mutex;
830831
struct TCP_Server_Info *server; /* pointer to server info */
831832
int ses_count; /* reference counter */

fs/cifs/connect.c

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2539,34 +2539,6 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb_vol *volume_info)
25392539
return rc;
25402540
}
25412541

2542-
/**
2543-
* cifs_free_ipc - helper to release the session IPC tcon
2544-
*
2545-
* Needs to be called everytime a session is destroyed
2546-
*/
2547-
static int
2548-
cifs_free_ipc(struct cifs_ses *ses)
2549-
{
2550-
int rc = 0, xid;
2551-
struct cifs_tcon *tcon = ses->tcon_ipc;
2552-
2553-
if (tcon == NULL)
2554-
return 0;
2555-
2556-
if (ses->server->ops->tree_disconnect) {
2557-
xid = get_xid();
2558-
rc = ses->server->ops->tree_disconnect(xid, tcon);
2559-
free_xid(xid);
2560-
}
2561-
2562-
if (rc)
2563-
cifs_dbg(FYI, "failed to disconnect IPC tcon (rc=%d)\n", rc);
2564-
2565-
tconInfoFree(tcon);
2566-
ses->tcon_ipc = NULL;
2567-
return rc;
2568-
}
2569-
25702542
static struct cifs_ses *
25712543
cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
25722544
{
@@ -2590,25 +2562,40 @@ void cifs_put_smb_ses(struct cifs_ses *ses)
25902562
{
25912563
unsigned int rc, xid;
25922564
struct TCP_Server_Info *server = ses->server;
2565+
struct cifs_tcon *tcon;
2566+
bool do_logoff;
25932567

25942568
cifs_dbg(FYI, "%s: ses_count=%d\n", __func__, ses->ses_count);
25952569

25962570
spin_lock(&cifs_tcp_ses_lock);
2597-
if (ses->status == CifsExiting) {
2598-
spin_unlock(&cifs_tcp_ses_lock);
2599-
return;
2600-
}
2601-
if (--ses->ses_count > 0) {
2571+
spin_lock(&ses->ses_lock);
2572+
2573+
if (ses->status == CifsExiting || --ses->ses_count > 0) {
2574+
spin_unlock(&ses->ses_lock);
26022575
spin_unlock(&cifs_tcp_ses_lock);
26032576
return;
26042577
}
2605-
if (ses->status == CifsGood)
2606-
ses->status = CifsExiting;
2607-
spin_unlock(&cifs_tcp_ses_lock);
26082578

2609-
cifs_free_ipc(ses);
2579+
ses->need_reconnect = false;
26102580

2611-
if (ses->status == CifsExiting && server->ops->logoff) {
2581+
do_logoff = ses->status == CifsGood && server->ops->logoff;
2582+
ses->status = CifsExiting;
2583+
tcon = ses->tcon_ipc;
2584+
ses->tcon_ipc = NULL;
2585+
2586+
spin_unlock(&ses->ses_lock);
2587+
spin_unlock(&cifs_tcp_ses_lock);
2588+
2589+
/*
2590+
* On session close, the IPC is closed and the server must release all
2591+
* tcons of the session. No need to send a tree disconnect here.
2592+
*
2593+
* Besides, it will make the server to not close durable and resilient
2594+
* files on session close, as specified in MS-SMB2 3.3.5.6 Receiving an
2595+
* SMB2 LOGOFF Request.
2596+
*/
2597+
tconInfoFree(tcon);
2598+
if (do_logoff) {
26122599
xid = get_xid();
26132600
rc = server->ops->logoff(xid, ses);
26142601
if (rc)

0 commit comments

Comments
 (0)