intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 23:03:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: check for nullptr before dereferencing

Browse Source 
Related-To: NEO-13467

Signed-off-by: Maciej Bielski <maciej.bielski@intel.com>
This commit is contained in:
Maciej Bielski
2024-12-10 16:09:41 +00:00
committed by Compute-Runtime-Automation
parent 093d987e33
commit 41a6815d06
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
level_zero/sysman/source/api/events/linux/sysman_os_events_imp.cpp
View File

@@ -268,30 +268,38 @@ bool LinuxEventsUtil::checkIfFabricPortStatusChanged(void *dev, zes_event_type_f
void LinuxEventsUtil::getDevIndexToDevPathMap(std::vector<zes_event_type_flags_t> &registeredEvents, uint32_t count, zes_device_handle_t *phDevices, std::map<uint32_t, std::string> &mapOfDevIndexToDevPath) {
for (uint32_t devIndex = 0; devIndex < count; devIndex++) {
auto device = static_cast<SysmanDeviceImp *>(L0::Sysman::SysmanDevice::fromHandle(phDevices[devIndex]));
registeredEvents[devIndex] = deviceEventsMap[device];
if (deviceEventsMap.find(device) != deviceEventsMap.end()) {
registeredEvents[devIndex] = deviceEventsMap[device];
}
if (!registeredEvents[devIndex]) {
continue;
} else {
std::string bdf;
auto pSysfsAccess = &static_cast<L0::Sysman::LinuxSysmanImp *>(device->deviceGetOsInterface())->getSysfsAccess();
if (pSysfsAccess->getRealPath("device", bdf) == ZE_RESULT_SUCCESS) {
// /sys needs to be removed from real path inorder to equate with
// DEVPATH property of uevent.
// Example of real path: /sys/devices/pci0000:97/0000:97:02.0/0000:98:00.0/0000:99:01.0/0000:9a:00.0
// Example of DEVPATH: /devices/pci0000:97/0000:97:02.0/0000:98:00.0/0000:99:01.0/0000:9a:00.0/i915.iaf.0
const auto loc = bdf.find("/devices");
if (loc == std::string::npos) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr,
"%s", "Invalid device path\n");
continue;
}
}
bdf = bdf.substr(loc);
mapOfDevIndexToDevPath.insert({devIndex, bdf});
} else {
auto *osInterface = static_cast<L0::Sysman::LinuxSysmanImp *>(device->deviceGetOsInterface());
if (!osInterface) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr,
"%s", "Failed to get OS Interface\n");
UNRECOVERABLE_IF(true);
}
std::string bdf;
auto pSysfsAccess = &osInterface->getSysfsAccess();
if (pSysfsAccess->getRealPath("device", bdf) == ZE_RESULT_SUCCESS) {
// /sys needs to be removed from real path inorder to equate with
// DEVPATH property of uevent.
// Example of real path: /sys/devices/pci0000:97/0000:97:02.0/0000:98:00.0/0000:99:01.0/0000:9a:00.0
// Example of DEVPATH: /devices/pci0000:97/0000:97:02.0/0000:98:00.0/0000:99:01.0/0000:9a:00.0/i915.iaf.0
const auto loc = bdf.find("/devices");
if (loc == std::string::npos) {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr,
"%s", "Failed to get real path of device\n");
"%s", "Invalid device path\n");
continue;
}
bdf = bdf.substr(loc);
mapOfDevIndexToDevPath.insert({devIndex, bdf});
} else {
NEO::printDebugString(NEO::debugManager.flags.PrintDebugMessages.get(), stderr,
"%s", "Failed to get real path of device\n");
}
}
}