Skip to content

Commit 94083db

Browse files
dhkts1gregkh
authored andcommitted
ksmbd: fix use-after-free of a deferred file_lock on SMB2_CLOSE then SMB2_CANCEL
commit 10f293a upstream. Commit f580d27 ("ksmbd: fix use-after-free of a deferred file_lock on double SMB2_CANCEL") made smb2_cancel() skip a work whose state is KSMBD_WORK_CANCELLED, so its cancel_fn cannot be fired a second time. But KSMBD_WORK has three states (ACTIVE, CANCELLED, CLOSED), and the same freeing producer path is reached for CLOSED too: SMB2_CLOSE on the locking handle -> set_close_state_blocked_works() sets the deferred work's state to KSMBD_WORK_CLOSED and wakes the smb2_lock() worker. The worker takes the non-ACTIVE early-exit, locks_free_lock()s the file_lock and, because the state is not KSMBD_WORK_CANCELLED, takes the STATUS_RANGE_NOT_LOCKED branch with "goto out2" -- which, like the cancelled branch, skips release_async_work(). The work stays on conn->async_requests with a live cancel_fn = smb2_remove_blocked_lock pointing at the freed file_lock. A subsequent SMB2_CANCEL for the same AsyncId then passes the KSMBD_WORK_CANCELLED-only guard (its state is KSMBD_WORK_CLOSED), so smb2_cancel() fires cancel_fn again over the freed file_lock -- the same use-after-free fixed, via SMB2_CLOSE instead of a first SMB2_CANCEL: BUG: KASAN: slab-use-after-free in __locks_delete_block __locks_delete_block locks_delete_block ksmbd_vfs_posix_lock_unblock smb2_remove_blocked_lock smb2_cancel <- 2nd SMB2_CANCEL fires cancel_fn handle_ksmbd_work Allocated by ...: locks_alloc_lock <- smb2_lock Freed by ...: locks_free_lock <- smb2_lock (non-ACTIVE early-exit) ... cache file_lock_cache of size 192 Reproduced on mainline 7.1-rc7 (which already contains f580d27) with KASAN by an authenticated SMB client; the double-SMB2_CANCEL control is silent on that kernel, so the splat is attributable to the CLOSE trigger. Only an ACTIVE deferred work may have its cancel_fn fired: both terminal states (CANCELLED and CLOSED) reach the smb2_lock() early-exit that frees the file_lock and skips release_async_work(). Guard on KSMBD_WORK_ACTIVE so any non-active work is skipped. Fixes: f580d27 ("ksmbd: fix use-after-free of a deferred file_lock on double SMB2_CANCEL") Cc: stable@vger.kernel.org Signed-off-by: Gil Portnoy <dddhkts1@gmail.com> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ef6feb7 commit 94083db

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

fs/smb/server/smb2pdu.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7334,14 +7334,14 @@ int smb2_cancel(struct ksmbd_work *work)
73347334
continue;
73357335

73367336
/*
7337-
* A cancelled deferred byte-range lock frees its
7338-
* file_lock and takes the smb2_lock() early-exit that
7339-
* skips release_async_work(), so the work stays on
7340-
* conn->async_requests with a live cancel_fn pointing
7341-
* at the freed file_lock. Re-firing it on a second
7342-
* SMB2_CANCEL is a use-after-free.
7337+
* Only an ACTIVE deferred work may have its cancel_fn
7338+
* fired. A CANCELLED or CLOSED work already took the
7339+
* smb2_lock() non-ACTIVE early-exit that frees the
7340+
* file_lock and skips release_async_work(), so it is
7341+
* still on conn->async_requests with a live cancel_fn
7342+
* pointing at the freed file_lock.
73437343
*/
7344-
if (iter->state == KSMBD_WORK_CANCELLED)
7344+
if (iter->state != KSMBD_WORK_ACTIVE)
73457345
break;
73467346

73477347
ksmbd_debug(SMB,

0 commit comments

Comments
 (0)