Skip to content

hwcomposer: Prevent null pointer dereference on layer buffer handle #73

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
herobuxx wants to merge 1 commit into
base: dev/lineage-23.2
Choose a base branch
from
Open

hwcomposer: Prevent null pointer dereference on layer buffer handle #73

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions hwcomposer/hwcomposer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ namespace {
}

buffer *get_wl_buffer(waydroid_hwc_composer_device_1 *pdev, hwc_layer_1_t *layer, size_t pos) {
if (!layer || !layer->handle) {
return nullptr;
}
const auto& gralloc_handler = pdev->gralloc_handler;
auto metadata = gralloc_handler.get_buffer_metadata(pdev->display, layer, pos);
if (!metadata.format) {
Expand Down
10 changes: 6 additions & 4 deletions hwcomposer/modes/waydroid_mode_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,12 @@ class non_compositing_window_mode : public virtual waydroid_mode {
*/
int res = 0;
if (i == m_draw_framebuffer_at) {
assert(m_framebuffer_target->handle);
window *window = derived()->get_window(pdev);

res = apply_hwc_layer_to_window(pdev, m_framebuffer_target, m_framebuffer_target_index, window);
if (m_framebuffer_target && m_framebuffer_target->handle) {
window *window = derived()->get_window(pdev);
res = apply_hwc_layer_to_window(pdev, m_framebuffer_target, m_framebuffer_target_index, window);
} else {
ALOGW("m_framebuffer_target is not ready or has null handle");
}
}

// The acquireFenceFd of HWC_FRAMEBUFFER_TARGET is closed in apply_hwc_layer_to_window
Expand Down