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
38325e70
Commit
38325e70
authored
Aug 27, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make private applets hidden
parent
646260ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
26 deletions
+48
-26
applets.cpp
native/src/core/applets.cpp
+42
-19
entry.cpp
native/src/zygisk/entry.cpp
+1
-1
main.cpp
native/src/zygisk/main.cpp
+5
-6
No files found.
native/src/core/applets.cpp
View file @
38325e70
...
@@ -8,45 +8,68 @@
...
@@ -8,45 +8,68 @@
using
namespace
std
;
using
namespace
std
;
using
main_fun
=
int
(
*
)(
int
,
char
*
[]);
struct
Applet
{
string_view
name
;
int
(
*
fn
)(
int
,
char
*
[]);
};
constexpr
const
char
*
applets
[]
=
{
"su"
,
"resetprop"
,
"zygisk"
,
nullptr
};
constexpr
Applet
applets
[]
=
{
static
main_fun
applet_mains
[]
=
{
su_client_main
,
resetprop_main
,
zygisk_main
,
nullptr
};
{
"su"
,
su_client_main
},
{
"resetprop"
,
resetprop_main
},
};
static
int
call_applet
(
int
argc
,
char
*
argv
[])
{
constexpr
Applet
private_applets
[]
=
{
// Applets
{
"zygisk"
,
zygisk_main
},
string_view
base
=
basename
(
argv
[
0
]);
};
for
(
int
i
=
0
;
applets
[
i
];
++
i
)
{
if
(
base
==
applets
[
i
])
{
return
(
*
applet_mains
[
i
])(
argc
,
argv
);
}
}
fprintf
(
stderr
,
"%s: applet not found
\n
"
,
base
.
data
());
return
1
;
}
int
main
(
int
argc
,
char
*
argv
[])
{
int
main
(
int
argc
,
char
*
argv
[])
{
if
(
argc
<
1
)
return
1
;
enable_selinux
();
enable_selinux
();
cmdline_logging
();
cmdline_logging
();
init_argv0
(
argc
,
argv
);
init_argv0
(
argc
,
argv
);
string_view
base
=
basename
(
argv
[
0
]);
string_view
argv0
=
basename
(
argv
[
0
]);
// app_process is actually not an applet
// app_process is actually not an applet
if
(
str_starts
(
base
,
"app_process"
))
{
if
(
argv0
.
starts_with
(
"app_process"
))
{
return
app_process_main
(
argc
,
argv
);
return
app_process_main
(
argc
,
argv
);
}
}
umask
(
0
);
umask
(
0
);
if
(
base
==
"magisk"
||
base
==
"magisk32"
||
base
==
"magisk64"
)
{
if
(
argv
[
0
][
0
]
==
'\0'
)
{
// When argv[0] is an empty string, we're calling private applets
if
(
argc
<
2
)
return
1
;
--
argc
;
++
argv
;
for
(
const
auto
&
app
:
private_applets
)
{
if
(
argv
[
0
]
==
app
.
name
)
{
return
app
.
fn
(
argc
,
argv
);
}
}
fprintf
(
stderr
,
"%s: applet not found
\n
"
,
argv
[
0
]);
return
1
;
}
if
(
argv0
==
"magisk"
||
argv0
==
"magisk32"
||
argv0
==
"magisk64"
)
{
if
(
argc
>
1
&&
argv
[
1
][
0
]
!=
'-'
)
{
if
(
argc
>
1
&&
argv
[
1
][
0
]
!=
'-'
)
{
// Calling applet
via magisk [applet] args
// Calling applet
with "magisk [applet] args..."
--
argc
;
--
argc
;
++
argv
;
++
argv
;
argv0
=
argv
[
0
];
}
else
{
}
else
{
return
magisk_main
(
argc
,
argv
);
return
magisk_main
(
argc
,
argv
);
}
}
}
}
return
call_applet
(
argc
,
argv
);
for
(
const
auto
&
app
:
applets
)
{
if
(
argv0
==
app
.
name
)
{
return
app
.
fn
(
argc
,
argv
);
}
}
fprintf
(
stderr
,
"%s: applet not found
\n
"
,
argv0
.
data
());
return
1
;
}
}
native/src/zygisk/entry.cpp
View file @
38325e70
...
@@ -177,7 +177,7 @@ static void connect_companion(int client, bool is_64_bit) {
...
@@ -177,7 +177,7 @@ static void connect_companion(int client, bool is_64_bit) {
fcntl
(
fds
[
1
],
F_SETFD
,
0
);
fcntl
(
fds
[
1
],
F_SETFD
,
0
);
char
buf
[
16
];
char
buf
[
16
];
snprintf
(
buf
,
sizeof
(
buf
),
"%d"
,
fds
[
1
]);
snprintf
(
buf
,
sizeof
(
buf
),
"%d"
,
fds
[
1
]);
execl
(
exe
.
data
(),
"zygisk"
,
"companion"
,
buf
,
(
char
*
)
nullptr
);
execl
(
exe
.
data
(),
"
"
,
"
zygisk"
,
"companion"
,
buf
,
(
char
*
)
nullptr
);
exit
(
-
1
);
exit
(
-
1
);
}
}
close
(
fds
[
1
]);
close
(
fds
[
1
]);
...
...
native/src/zygisk/main.cpp
View file @
38325e70
...
@@ -46,17 +46,16 @@ int app_process_main(int argc, char *argv[]) {
...
@@ -46,17 +46,16 @@ int app_process_main(int argc, char *argv[]) {
fcntl
(
fds
[
1
],
F_SETFD
,
0
);
fcntl
(
fds
[
1
],
F_SETFD
,
0
);
snprintf
(
buf
,
sizeof
(
buf
),
"%d"
,
fds
[
1
]);
snprintf
(
buf
,
sizeof
(
buf
),
"%d"
,
fds
[
1
]);
#if defined(__LP64__)
#if defined(__LP64__)
execlp
(
"magisk"
,
"zygisk"
,
"passthrough"
,
buf
,
"1"
,
(
char
*
)
nullptr
);
execlp
(
"magisk"
,
"
"
,
"
zygisk"
,
"passthrough"
,
buf
,
"1"
,
(
char
*
)
nullptr
);
#else
#else
execlp
(
"magisk"
,
"zygisk"
,
"passthrough"
,
buf
,
"0"
,
(
char
*
)
nullptr
);
execlp
(
"magisk"
,
"
"
,
"
zygisk"
,
"passthrough"
,
buf
,
"0"
,
(
char
*
)
nullptr
);
#endif
#endif
exit
(
-
1
);
exit
(
-
1
);
}
}
close
(
fds
[
1
]);
close
(
fds
[
1
]);
if
(
read_int
(
fds
[
0
])
!=
0
)
{
if
(
read_int
(
fds
[
0
])
!=
0
)
{
fprintf
(
stderr
,
"Failed to connect magisk daemon, "
fprintf
(
stderr
,
"Failed to connect magiskd, try umount %s or reboot.
\n
"
,
argv
[
0
]);
"try umount %s or reboot.
\n
"
,
argv
[
0
]);
return
1
;
return
1
;
}
}
int
app_proc_fd
=
recv_fd
(
fds
[
0
]);
int
app_proc_fd
=
recv_fd
(
fds
[
0
]);
...
@@ -131,8 +130,8 @@ static void zygiskd(int socket) {
...
@@ -131,8 +130,8 @@ static void zygiskd(int socket) {
struct
stat
s
{};
struct
stat
s
{};
if
(
fstat
(
fd
,
&
s
)
==
0
&&
S_ISREG
(
s
.
st_mode
))
{
if
(
fstat
(
fd
,
&
s
)
==
0
&&
S_ISREG
(
s
.
st_mode
))
{
android_dlextinfo
info
{
android_dlextinfo
info
{
.
flags
=
ANDROID_DLEXT_USE_LIBRARY_FD
,
.
flags
=
ANDROID_DLEXT_USE_LIBRARY_FD
,
.
library_fd
=
fd
,
.
library_fd
=
fd
,
};
};
if
(
void
*
h
=
android_dlopen_ext
(
"/jit-cache"
,
RTLD_LAZY
,
&
info
))
{
if
(
void
*
h
=
android_dlopen_ext
(
"/jit-cache"
,
RTLD_LAZY
,
&
info
))
{
*
(
void
**
)
&
entry
=
dlsym
(
h
,
"zygisk_companion_entry"
);
*
(
void
**
)
&
entry
=
dlsym
(
h
,
"zygisk_companion_entry"
);
...
...
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