Skip to contentSkip to conversation

ksmbd: fix use-after-free in __ksmbd_close_fd() lock cleanup

PATCH In review munan Huang 3 participants 5 messages Apr 2 – Apr 4

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ksmbd: fix use-after-free in __ksmbd_close_fd() lock cleanup

In __ksmbd_close_fd(), when cleaning up byte-range locks on a durable file handle closed by the scavenger, the lock cleanup loop unconditionally dereferences fp->conn->llist_lock to remove each lock from the connection's list:

  list_for_each_entry_safe(smb_lock, tmp_lock, &fp->lock_list, flist) {
      spin_lock(&fp->conn->llist_lock);
      list_del(&smb_lock->clist);
      spin_unlock(&fp->conn->llist_lock);
  }

However, when a client disconnects without SMB2 LOGOFF, ksmbd preserves durable file handles via session_fd_check(), which sets fp->conn to NULL and arms the durable scavenger timeout, but does not detach the byte-range locks from the dying connection's lock list.

When the scavenger timeout expires, ksmbd_durable_scavenger() calls __ksmbd_close_fd(NULL, fp). At this point fp->conn is NULL and the original connection object has already been freed by ksmbd_conn_free(), so it would cause a use-after-free or NULL pointer dereference.

Fix by checking fp->conn for NULL before accessing fp->conn->llist_lock in the lock cleanup loop.

Fixes c8efcc786146 ("ksmbd: add support for durable handles v1/v2")
---
 fs/smb/server/vfs_cache.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
fs/smb/server/vfs_cache.c +5 -3
index 168f2dd7e200..772a84d95fe3 100644
@@ -463,9 +463,11 @@ static void __ksmbd_close_fd(struct ksmbd_file_table *ft, struct ksmbd_file *fp)
 	 * there are not accesses to fp->lock_list.
 	 */
 	list_for_each_entry_safe(smb_lock, tmp_lock, &fp->lock_list, flist) {
-		spin_lock(&fp->conn->llist_lock);
-		list_del(&smb_lock->clist);
-		spin_unlock(&fp->conn->llist_lock);
+		if (fp->conn) {
+			spin_lock(&fp->conn->llist_lock);
+			list_del(&smb_lock->clist);
+			spin_unlock(&fp->conn->llist_lock);
+		}
 
 		list_del(&smb_lock->flist);
 		locks_free_lock(smb_lock->fl);
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 22 lines · munan Huang

In __ksmbd_close_fd(), when cleaning up byte-range locks on a durable file handle closed by the scavenger, the lock cleanup loop unconditionally dereferences fp->conn->llist_lock to remove each lock from the connection's list:

  list_for_each_entry_safe(smb_lock, tmp_lock, &fp->lock_list, flist) {
      spin_lock(&fp->conn->llist_lock);
      list_del(&smb_lock->clist);
      spin_unlock(&fp->conn->llist_lock);
  }

However, when a client disconnects without SMB2 LOGOFF, ksmbd preserves durable file handles via session_fd_check(), which sets fp->conn to NULL and arms the durable scavenger timeout, but does not detach the byte-range locks from the dying connection's lock list.

When the scavenger timeout expires, ksmbd_durable_scavenger() calls __ksmbd_close_fd(NULL, fp). At this point fp->conn is NULL and the original connection object has already been freed by ksmbd_conn_free(), so it would cause a use-after-free or NULL pointer dereference.

Quoted 6 lines

Fix by checking fp->conn for NULL before accessing fp->conn->llist_lock in the lock cleanup loop.

Fixes c8efcc786146 ("ksmbd: add support for durable handles v1/v2")

I will apply the following patch instead of your patch. Let me know if I am missing something.
https://github.com/smfrench/smb3-kernel/commit/319ca5432460b0749e420f7cff637dfbc7e16be3
Thanks.

reviewer
#2 lore raw

Hi Namjae and munan,

In ksmbd_reopen_durable_fd(), when -EBADF is returned, should list_del(&smb_lock->clist) be called?

If my understanding is incorrect, please let me know.

Quoted 13 lines

int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)

{
	...
	fp->conn = conn;
	...

	list_for_each_entry(smb_lock, &fp->lock_list, flist) {
		spin_lock(&conn->llist_lock);
		list_add_tail(&smb_lock->clist, &conn->lock_list);
		spin_unlock(&conn->llist_lock);
	}
	...
Quoted 8 lines
	__open_id(&work->sess->file_table, fp, OPEN_ID_TYPE_VOLATILE_ID);
	if (!has_file_id(fp->volatile_id)) {
		fp->conn = NULL;
		fp->tcon = NULL;
		return -EBADF;
	}
	return 0;
}

Thanks,
ChenXiaoSong <[email protected]>

Quoted 4 lines · Namjae Jeon

I will apply the following patch instead of your patch. Let me know if
I am missing something.
https://github.com/smfrench/smb3-kernel/ commit/319ca5432460b0749e420f7cff637dfbc7e16be3 Thanks.