Skip to content

Fixed firmware detections on Linux #413

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

Merged
NotRequiem merged 1 commit into from
Jun 1, 2025
Merged

Fixed firmware detections on Linux #413

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
38 changes: 19 additions & 19 deletions src/vmaware.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
#elif VMA_CPLUSPLUS >= 202002L
# define CPP 20
# ifdef __VMAWARE_DEBUG__
# pragma message("using C++20")

Check warning on line 254 in src/vmaware.hpp

View workflow job for this annotation

GitHub Actions / Analyze (cpp, gcc-14, Ninja Multi-Config, Debug, ON) 

using C++20 [-W#pragma-messages]
# endif

#elif VMA_CPLUSPLUS >= 201703L
Expand Down Expand Up @@ -5864,32 +5864,30 @@
return false;
#elif (LINUX)
// Author: dmfrpro
if (!util::is_admin()) {
return false;
}

DIR* dir = opendir("/sys/firmware/acpi/tables/");
if (!dir) {
debug("FIRMWARE: could not open ACPI tables directory");
return false;
}

// Same targets as the Windows branch but without "WAET"
constexpr const char* targets[] = {
"Parallels Software International","Parallels(R)","innotek",
"Oracle","VirtualBox","vbox","VBOX","VS2005R2",
"Parallels Software International","Parallels(R)",
"innotek","Oracle","VirtualBox","vbox","VBOX","VS2005R2",
"VMware, Inc.","VMware","VMWARE",
"S3 Corp.","Virtual Machine","QEMU","pc-q35","BOCHS","BXPC"
};

struct dirent* entry;
while ((entry = readdir(dir)) != nullptr) {
// Skip "." and ".."
if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
if (strcmp(entry->d_name, ".") == 0 ||
strcmp(entry->d_name, "..") == 0)
continue;

char path[PATH_MAX];
snprintf(path, sizeof(path), "/sys/firmware/acpi/tables/%s", entry->d_name);
snprintf(path, sizeof(path),
"/sys/firmware/acpi/tables/%s",
entry->d_name);

int fd = open(path, O_RDONLY);
if (fd == -1) {
Expand All @@ -5898,17 +5896,11 @@
}

struct stat statbuf;
if (fstat(fd, &statbuf) != 0) {
if (fstat(fd, &statbuf) != 0 || S_ISDIR(statbuf.st_mode)) {
debug("FIRMWARE: skipped ", entry->d_name);
close(fd);
continue;
}
if (S_ISDIR(statbuf.st_mode)) {
debug("FIRMWARE: skipped directory ", entry->d_name);
close(fd);
continue;
}

long file_size = statbuf.st_size;
if (file_size <= 0) {
debug("FIRMWARE: file empty or error ", entry->d_name);
Expand All @@ -5922,13 +5914,20 @@
close(fd);
continue;
}

ssize_t n = read(fd, buffer, file_size);
close(fd);
if (n != file_size) {
debug("FIRMWARE: could not read full table ", entry->d_name);
free(buffer);
continue;
}

for (const char* target : targets) {
size_t targetLen = strlen(target);
if (targetLen == 0 || file_size < static_cast<long>(targetLen))
if ((long)targetLen > file_size)
continue;
for (long j = 0; j <= file_size - static_cast<long>(targetLen); ++j) {
for (long j = 0; j <= file_size - (long)targetLen; ++j) {
if (memcmp(buffer + j, target, targetLen) == 0) {
const char* brand = nullptr;
if (strcmp(target, "Parallels Software International") == 0 ||
Expand All @@ -5947,13 +5946,14 @@
strcmp(target, "VMWARE") == 0) {
brand = brands::VMWARE;
}
else if (strcmp(target, "QEMU")) {
else if (strcmp(target, "QEMU") == 0) {
brand = brands::QEMU;
}
else if (strcmp(target, "BOCHS") == 0 ||
strcmp(target, "BXPC") == 0) {
brand = brands::BOCHS;
}

free(buffer);
closedir(dir);
if (brand)
Expand Down
Loading