cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin/hook: disallow multiple hooks per function (#12320)

Browse source 
this was never safe. After recent changes, it's become even less so. Just disallow it.

ref #11992
This commit is contained in:
Vaxry 2025-11-16 12:01:48 +00:00 • committed by GitHub
parent b35f78431f
commit 9b006b2c85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/HookSystem.cpp
View file

@ -144,6 +144,12 @@ bool CFunctionHook::hook() {
return false; return false;
#endif #endif
if (g_pFunctionHookSystem->m_activeHooks.contains(rc<uint64_t>(m_source))) {
// TODO: return actual error codes...
Debug::log(ERR, "[functionhook] failed, function is already hooked");
return false;
}
// jmp rel32 // jmp rel32
// offset for relative addr: 1 // offset for relative addr: 1
static constexpr uint8_t RELATIVE_JMP_ADDRESS[] = {0xE9, 0x00, 0x00, 0x00, 0x00}; static constexpr uint8_t RELATIVE_JMP_ADDRESS[] = {0xE9, 0x00, 0x00, 0x00, 0x00};
@ -231,6 +237,8 @@ bool CFunctionHook::hook() {
m_active = true; m_active = true;
m_hookLen = ORIGSIZE; m_hookLen = ORIGSIZE;
g_pFunctionHookSystem->m_activeHooks.emplace(rc<uint64_t>(m_source));
return true; return true;
} }
@ -243,6 +251,8 @@ bool CFunctionHook::unhook() {
if (!m_active) if (!m_active)
return false; return false;
g_pFunctionHookSystem->m_activeHooks.erase(rc<uint64_t>(m_source));
// allow write to src // allow write to src
mprotect(sc<uint8_t*>(m_source) - rc<uint64_t>(m_source) % sysconf(_SC_PAGE_SIZE), sysconf(_SC_PAGE_SIZE), PROT_READ | PROT_WRITE | PROT_EXEC); mprotect(sc<uint8_t*>(m_source) - rc<uint64_t>(m_source) % sysconf(_SC_PAGE_SIZE), sysconf(_SC_PAGE_SIZE), PROT_READ | PROT_WRITE | PROT_EXEC);

4
src/plugins/HookSystem.hpp
View file

@ -3,6 +3,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <cstddef> #include <cstddef>
#include <unordered_set>
#include "../helpers/memory/Memory.hpp" #include "../helpers/memory/Memory.hpp"
#define HANDLE void* #define HANDLE void*
@ -70,7 +71,8 @@ class CHookSystem {
uint64_t used = 0; uint64_t used = 0;
}; };
std::vector<SAllocatedPage> m_pages; std::vector<SAllocatedPage> m_pages;
std::unordered_set<uint64_t> m_activeHooks;
friend class CFunctionHook; friend class CFunctionHook;
}; };