Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
636223b2
Commit
636223b2
authored
Jan 09, 2023
by
topjohnwu
Committed by
John Wu
Jan 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup APIs
parent
aa0a2f77
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
117 additions
and
142 deletions
+117
-142
api.hpp
native/src/zygisk/api.hpp
+5
-29
hook.cpp
native/src/zygisk/hook.cpp
+95
-75
module.hpp
native/src/zygisk/module.hpp
+17
-38
No files found.
native/src/zygisk/api.hpp
View file @
636223b2
...
...
@@ -228,21 +228,9 @@ struct Api {
// will be set to nullptr.
void
hookJniNativeMethods
(
JNIEnv
*
env
,
const
char
*
className
,
JNINativeMethod
*
methods
,
int
numMethods
);
// For ELFs loaded in memory matching `regex`, replace function `symbol` with `newFunc`.
// If `oldFunc` is not nullptr, the original function pointer will be saved to `oldFunc`.
void
pltHookRegister
(
const
char
*
regex
,
const
char
*
symbol
,
void
*
newFunc
,
void
**
oldFunc
);
// For ELFs loaded in memory matching `regex`, exclude hooks registered for `symbol`.
// If `symbol` is nullptr, then all symbols will be excluded.
void
pltHookExclude
(
const
char
*
regex
,
const
char
*
symbol
);
// For ELFs loaded in memory matching `inode`, replace function `symbol` with `newFunc`.
// If `oldFunc` is not nullptr, the original function pointer will be saved to `oldFunc`.
void
pltHookRegisterInode
(
ino_t
inode
,
const
char
*
symbol
,
void
*
newFunc
,
void
**
oldFunc
);
// For ELFs loaded in memory matching `inode`, exclude hooks registered for `symbol`.
// If `symbol` is nullptr, then all symbols will be excluded.
void
pltHookExcludeInode
(
ino_t
inode
,
const
char
*
symbol
);
void
pltHookRegister
(
ino_t
inode
,
const
char
*
symbol
,
void
*
newFunc
,
void
**
oldFunc
);
// Commit all the hooks that was previously registered.
// Returns false if an error occurred.
...
...
@@ -303,16 +291,13 @@ struct api_table {
bool
(
*
registerModule
)(
api_table
*
,
module_abi
*
);
void
(
*
hookJniNativeMethods
)(
JNIEnv
*
,
const
char
*
,
JNINativeMethod
*
,
int
);
void
(
*
pltHookRegister
)(
const
char
*
,
const
char
*
,
void
*
,
void
**
);
void
(
*
pltHookExclude
)(
const
char
*
,
const
char
*
);
void
(
*
pltHookRegister
)(
ino_t
,
const
char
*
,
void
*
,
void
**
);
bool
(
*
exemptFd
)(
int
);
bool
(
*
pltHookCommit
)();
int
(
*
connectCompanion
)(
void
*
/* impl */
);
void
(
*
setOption
)(
void
*
/* impl */
,
Option
);
int
(
*
getModuleDir
)(
void
*
/* impl */
);
uint32_t
(
*
getFlags
)(
void
*
/* impl */
);
bool
(
*
exemptFd
)(
int
);
void
(
*
pltHookRegisterInode
)(
ino_t
,
const
char
*
,
void
*
,
void
**
);
void
(
*
pltHookExcludeInode
)(
ino_t
,
const
char
*
);
};
template
<
class
T
>
...
...
@@ -342,20 +327,11 @@ inline uint32_t Api::getFlags() {
inline
bool
Api
::
exemptFd
(
int
fd
)
{
return
tbl
->
exemptFd
!=
nullptr
&&
tbl
->
exemptFd
(
fd
);
}
inline
void
Api
::
pltHookRegisterInode
(
ino_t
inode
,
const
char
*
symbol
,
void
*
newFunc
,
void
**
oldFunc
)
{
if
(
tbl
->
pltHookExcludeInode
)
tbl
->
pltHookRegisterInode
(
inode
,
symbol
,
newFunc
,
oldFunc
);
}
inline
void
Api
::
pltHookExcludeInode
(
ino_t
inode
,
const
char
*
symbol
)
{
if
(
tbl
->
pltHookExcludeInode
)
tbl
->
pltHookExcludeInode
(
inode
,
symbol
);
}
inline
void
Api
::
hookJniNativeMethods
(
JNIEnv
*
env
,
const
char
*
className
,
JNINativeMethod
*
methods
,
int
numMethods
)
{
if
(
tbl
->
hookJniNativeMethods
)
tbl
->
hookJniNativeMethods
(
env
,
className
,
methods
,
numMethods
);
}
inline
void
Api
::
pltHookRegister
(
const
char
*
regex
,
const
char
*
symbol
,
void
*
newFunc
,
void
**
oldFunc
)
{
if
(
tbl
->
pltHookRegister
)
tbl
->
pltHookRegister
(
regex
,
symbol
,
newFunc
,
oldFunc
);
}
inline
void
Api
::
pltHookExclude
(
const
char
*
regex
,
const
char
*
symbol
)
{
if
(
tbl
->
pltHookExclude
)
tbl
->
pltHookExclude
(
regex
,
symbol
);
inline
void
Api
::
pltHookRegister
(
ino_t
inode
,
const
char
*
symbol
,
void
*
newFunc
,
void
**
oldFunc
)
{
if
(
tbl
->
pltHookRegister
)
tbl
->
pltHookRegister
(
inode
,
symbol
,
newFunc
,
oldFunc
);
}
inline
bool
Api
::
pltHookCommit
()
{
return
tbl
->
pltHookCommit
!=
nullptr
&&
tbl
->
pltHookCommit
();
...
...
native/src/zygisk/hook.cpp
View file @
636223b2
This diff is collapsed.
Click to expand it.
native/src/zygisk/module.hpp
View file @
636223b2
#pragma once
#include "api.hpp"
#include <list>
#include <regex.h>
namespace
{
...
...
@@ -126,24 +124,28 @@ struct api_abi_base {
};
struct
api_abi_v1
:
public
api_abi_base
{
void
(
*
hookJniNativeMethods
)(
JNIEnv
*
,
const
char
*
,
JNINativeMethod
*
,
int
);
void
(
*
pltHookRegister
)(
const
char
*
,
const
char
*
,
void
*
,
void
**
);
void
(
*
pltHookExclude
)(
const
char
*
,
const
char
*
);
bool
(
*
pltHookCommit
)();
int
(
*
connectCompanion
)(
ZygiskModule
*
);
void
(
*
setOption
)(
ZygiskModule
*
,
zygisk
::
Option
);
/* 0 */
void
(
*
hookJniNativeMethods
)(
JNIEnv
*
,
const
char
*
,
JNINativeMethod
*
,
int
);
/* 1 */
void
(
*
pltHookRegister
)(
const
char
*
,
const
char
*
,
void
*
,
void
**
);
/* 2 */
void
(
*
pltHookExclude
)(
const
char
*
,
const
char
*
);
/* 3 */
bool
(
*
pltHookCommit
)();
/* 4 */
int
(
*
connectCompanion
)(
ZygiskModule
*
);
/* 5 */
void
(
*
setOption
)(
ZygiskModule
*
,
zygisk
::
Option
);
};
struct
api_abi_v2
:
public
api_abi_v1
{
int
(
*
getModuleDir
)(
ZygiskModule
*
);
uint32_t
(
*
getFlags
)(
ZygiskModule
*
);
/* 6 */
int
(
*
getModuleDir
)(
ZygiskModule
*
);
/* 7 */
uint32_t
(
*
getFlags
)(
ZygiskModule
*
);
};
struct
api_abi_v4
:
public
api_abi_v2
{
bool
(
*
exemptFd
)(
int
);
void
(
*
pltHookRegisterInode
)(
ino_t
,
const
char
*
,
void
*
,
void
**
);
void
(
*
pltHookExcludeInode
)(
ino_t
,
const
char
*
);
struct
api_abi_v4
:
public
api_abi_base
{
/* 0 */
void
(
*
hookJniNativeMethods
)(
JNIEnv
*
,
const
char
*
,
JNINativeMethod
*
,
int
);
/* 1 */
void
(
*
pltHookRegister
)(
ino_t
,
const
char
*
,
void
*
,
void
**
);
/* 2 */
bool
(
*
exemptFd
)(
int
);
/* 3 */
bool
(
*
pltHookCommit
)();
/* 4 */
int
(
*
connectCompanion
)(
ZygiskModule
*
);
/* 5 */
void
(
*
setOption
)(
ZygiskModule
*
,
zygisk
::
Option
);
/* 6 */
int
(
*
getModuleDir
)(
ZygiskModule
*
);
/* 7 */
uint32_t
(
*
getFlags
)(
ZygiskModule
*
);
};
union
ApiTable
{
...
...
@@ -214,29 +216,6 @@ private:
long
*
api_version
;
module_abi_v1
*
v1
;
}
mod
;
struct
RegisterInfo
{
regex_t
regex
;
ino_t
inode
;
std
::
string
symbol
;
void
*
callback
;
void
**
backup
;
};
struct
IgnoreInfo
{
regex_t
regex
;
ino_t
inode
;
std
::
string
symbol
;
};
inline
static
pthread_mutex_t
hook_lock
=
PTHREAD_MUTEX_INITIALIZER
;
inline
static
std
::
list
<
RegisterInfo
>
register_info
{};
inline
static
std
::
list
<
IgnoreInfo
>
ignore_info
{};
static
void
PltHookRegister
(
const
char
*
lib
,
const
char
*
symbol
,
void
*
callback
,
void
**
backup
);
static
void
PltHookRegister
(
ino_t
inode
,
const
char
*
symbol
,
void
*
callback
,
void
**
backup
);
static
void
PltHookExclude
(
const
char
*
lib
,
const
char
*
symbol
);
static
void
PltHookExclude
(
ino_t
inode
,
const
char
*
symbol
);
static
bool
CommitPltHook
();
};
}
// namespace
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment