Skip to content

fix: capturev1 resource destroy callbacks: use deleteLater() to avoid UAF #811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
felixonmars wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: capturev1 resource destroy callbacks: use deleteLater() to avoid UAF #811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/modules/capture/impl/capturev1impl.cpp
View file
Open in desktop
Copy link
Copy Markdown
Member

@zccrs zccrs Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

要更新文件的copyright时间

Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ void capture_session_resource_destroy(struct wl_resource *resource)
return;
}
Q_EMIT session->beforeDestroy();
delete session;
// Use deleteLater() instead of delete to avoid re-entrant QObject destruction
// when this callback is triggered from within a WClient::destroyed slot (which
// fires from ~QObject of the WClient). Immediate deletion would free the Qt
// Connection object that doActivate() is currently iterating, causing a UAF
// crash in QBasicAtomicPointer::loadRelaxed (qobject.cpp:4317).
session->resource = nullptr; // resource is being freed; prevent double-destroy
session->deleteLater();
}

void capture_context_resource_destroy(struct wl_resource *resource)
Expand All @@ -98,7 +104,8 @@ void capture_context_resource_destroy(struct wl_resource *resource)
return;
}
Q_EMIT context->beforeDestroy();
delete context;
context->resource = nullptr;
context->deleteLater();
}

void capture_frame_resource_destroy(struct wl_resource *resource)
Expand All @@ -108,7 +115,8 @@ void capture_frame_resource_destroy(struct wl_resource *resource)
return;
}
Q_EMIT frame->beforeDestroy();
delete frame;
frame->resource = nullptr;
frame->deleteLater();
}

void treeland_capture_manager_bind(wl_client *client, void *data, uint32_t version, uint32_t id)
Expand Down Expand Up @@ -293,7 +301,8 @@ void treeland_capture_context_v1::setResource(wl_client *client, wl_resource *re
{
WClient *wClient = WClient::get(client);
connect(wClient, &WClient::destroyed, this, [this] {
wl_resource_destroy(this->resource);
if (this->resource)
wl_resource_destroy(this->resource);
});
this->resource = resource;
}
Expand Down Expand Up @@ -322,7 +331,8 @@ void treeland_capture_session_v1::setResource(wl_client *client, wl_resource *re
{
WClient *wClient = WClient::get(client);
connect(wClient, &WClient::destroyed, this, [this] {
wl_resource_destroy(this->resource);
if (this->resource)
wl_resource_destroy(this->resource);
});
this->resource = resource;
}
Expand All @@ -349,7 +359,8 @@ void treeland_capture_frame_v1::setResource(wl_client *client, wl_resource *reso
{
WClient *wClient = WClient::get(client);
connect(wClient, &WClient::destroyed, this, [this] {
wl_resource_destroy(this->resource);
if (this->resource)
wl_resource_destroy(this->resource);
});
this->resource = resource;
}
Expand Down
Loading