Skip to content

Commit

Permalink
ksmbd: fix use-after-free in __smb2_lease_break_noti()
Browse files Browse the repository at this point in the history
Move tcp_transport free to ksmbd_conn_free. If ksmbd connection is
referenced when ksmbd server thread terminates, It will not be freed,
but conn->tcp_transport is freed. __smb2_lease_break_noti can be performed
asynchronously when the connection is disconnected. __smb2_lease_break_noti
calls ksmbd_conn_write, which can cause use-after-free
when conn->ksmbd_transport is already freed.

Cc: stable@vger.kernel.org
Reported-by: Norbert Szetei <norbert@doyensec.com>
Tested-by: Norbert Szetei <norbert@doyensec.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
  • Loading branch information
Namjae Jeon authored and Steve French committed Apr 15, 2025
1 parent 1df0d4c commit 21a4e47
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 3 additions & 1 deletion fs/smb/server/connection.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)
xa_destroy(&conn->sessions);
kvfree(conn->request_buf);
kfree(conn->preauth_info);
if (atomic_dec_and_test(&conn->refcnt))
if (atomic_dec_and_test(&conn->refcnt)) {
ksmbd_free_transport(conn->transport);
kfree(conn);
}
}

/**
Expand Down
14 changes: 9 additions & 5 deletions fs/smb/server/transport_tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,21 @@ static struct tcp_transport *alloc_transport(struct socket *client_sk)
return t;
}

static void free_transport(struct tcp_transport *t)
void ksmbd_free_transport(struct ksmbd_transport *kt)
{
kernel_sock_shutdown(t->sock, SHUT_RDWR);
sock_release(t->sock);
t->sock = NULL;
struct tcp_transport *t = TCP_TRANS(kt);

ksmbd_conn_free(KSMBD_TRANS(t)->conn);
sock_release(t->sock);
kfree(t->iov);
kfree(t);
}

static void free_transport(struct tcp_transport *t)
{
kernel_sock_shutdown(t->sock, SHUT_RDWR);
ksmbd_conn_free(KSMBD_TRANS(t)->conn);
}

/**
* kvec_array_init() - initialize a IO vector segment
* @new: IO vector to be initialized
Expand Down
1 change: 1 addition & 0 deletions fs/smb/server/transport_tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

int ksmbd_tcp_set_interfaces(char *ifc_list, int ifc_list_sz);
struct interface *ksmbd_find_netdev_name_iface_list(char *netdev_name);
void ksmbd_free_transport(struct ksmbd_transport *kt);
int ksmbd_tcp_init(void);
void ksmbd_tcp_destroy(void);

Expand Down

0 comments on commit 21a4e47

Please sign in to comment.