Skip to content
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

Jump to bottom

Fix double free crash when create mmd fail #1805

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Fix double free crash when create mmd fail #1805

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
8 changes: 7 additions & 1 deletion media_driver/linux/common/media_interfaces/media_interfaces.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,16 @@ void* MmdDevice::CreateFactory(
{
MMD_FAILURE();
}

// transfer ownership of osinterface. No need to delete osinterface from this point.
device->Initialize(osInterface, mhwInterfaces);
if (device->m_mmdDevice == nullptr)
{
MMD_FAILURE();
mhwInterfaces->Destroy();
// no need to delete osinterface becauses it's already deleted in device->Initialize
MOS_Delete(mhwInterfaces);
MOS_Delete(device);
return nullptr;
}

void *mmdDevice = device->m_mmdDevice;
Expand Down
42 changes: 23 additions & 19 deletions media_driver/media_interface/media_interfaces_dg2/media_interfaces_dg2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,35 +277,38 @@ MOS_STATUS MmdDeviceXe_Hpm::Initialize(
PMOS_INTERFACE osInterface,
MhwInterfaces *mhwInterfaces)
{
#define MMD_FAILURE() \
{ \
if (device != nullptr) \
{ \
MOS_Delete(device); \
} \
return MOS_STATUS_NO_SPACE; \
}
MHW_FUNCTION_ENTER;

Mmd *device = nullptr;

if (mhwInterfaces->m_miInterface == nullptr)
if (mhwInterfaces->m_miInterface == nullptr || mhwInterfaces->m_veboxInterface == nullptr)
{
MMD_FAILURE();
}

if (mhwInterfaces->m_veboxInterface == nullptr)
{
MMD_FAILURE();
if (osInterface != nullptr)
{
if (osInterface->pfnDestroy)
{
osInterface->pfnDestroy(osInterface, false);
}
MOS_FreeMemory(osInterface);
}
return MOS_STATUS_NULL_POINTER;
}

Mmd *device = nullptr;
device = MOS_New(Mmd);

if (device == nullptr)
{
MMD_FAILURE();
if (osInterface != nullptr)
{
if (osInterface->pfnDestroy)
{
osInterface->pfnDestroy(osInterface, false);
}
MOS_FreeMemory(osInterface);
}
return MOS_STATUS_NO_SPACE;
}

// transfer ownership of osinterface to device. device will have exclusive ownership of osinterface and free it.
if (device->Initialize(
osInterface,
mhwInterfaces->m_cpInterface,
Expand All @@ -317,7 +320,8 @@ MOS_STATUS MmdDeviceXe_Hpm::Initialize(
mhwInterfaces->m_cpInterface = nullptr;
mhwInterfaces->m_miInterface = nullptr;
mhwInterfaces->m_veboxInterface = nullptr;
MMD_FAILURE();
MOS_Delete(device);
return MOS_STATUS_UNKNOWN;
}

m_mmdDevice = device;
Expand Down