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
9c6e64f4
Commit
9c6e64f4
authored
Feb 21, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Workaround compiler optimization bug
parent
0afa6015
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
magiskinit.c
native/jni/core/magiskinit.c
+1
-1
socket.c
native/jni/core/socket.c
+3
-1
magisk.h
native/jni/include/magisk.h
+1
-0
No files found.
native/jni/core/magiskinit.c
View file @
9c6e64f4
...
@@ -339,7 +339,7 @@ static void patch_socket_name(const char *path) {
...
@@ -339,7 +339,7 @@ static void patch_socket_name(const char *path) {
mmap_rw
(
path
,
&
buf
,
&
size
);
mmap_rw
(
path
,
&
buf
,
&
size
);
if
(
SOCKET_OFF
<
0
)
{
if
(
SOCKET_OFF
<
0
)
{
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
if
(
memcmp
(
buf
+
i
,
SOCKET_NAME
,
sizeof
(
SOCKET_NAME
))
==
0
)
{
if
(
memcmp
(
buf
+
i
,
socket_name
,
sizeof
(
SOCKET_NAME
))
==
0
)
{
SOCKET_OFF
=
i
;
SOCKET_OFF
=
i
;
break
;
break
;
}
}
...
...
native/jni/core/socket.c
View file @
9c6e64f4
...
@@ -8,13 +8,15 @@
...
@@ -8,13 +8,15 @@
#include "utils.h"
#include "utils.h"
#include "magisk.h"
#include "magisk.h"
char
socket_name
[]
=
SOCKET_NAME
;
/* Setup the address and return socket fd */
/* Setup the address and return socket fd */
int
setup_socket
(
struct
sockaddr_un
*
sun
)
{
int
setup_socket
(
struct
sockaddr_un
*
sun
)
{
int
fd
=
xsocket
(
AF_LOCAL
,
SOCK_STREAM
|
SOCK_CLOEXEC
,
0
);
int
fd
=
xsocket
(
AF_LOCAL
,
SOCK_STREAM
|
SOCK_CLOEXEC
,
0
);
memset
(
sun
,
0
,
sizeof
(
*
sun
));
memset
(
sun
,
0
,
sizeof
(
*
sun
));
sun
->
sun_family
=
AF_LOCAL
;
sun
->
sun_family
=
AF_LOCAL
;
sun
->
sun_path
[
0
]
=
'\0'
;
sun
->
sun_path
[
0
]
=
'\0'
;
memcpy
(
sun
->
sun_path
+
1
,
SOCKET_NAME
,
sizeof
(
SOCKET_NAME
));
memcpy
(
sun
->
sun_path
+
1
,
socket_name
,
sizeof
(
SOCKET_NAME
));
return
fd
;
return
fd
;
}
}
...
...
native/jni/include/magisk.h
View file @
9c6e64f4
...
@@ -55,6 +55,7 @@ extern char *argv0; /* For changing process name */
...
@@ -55,6 +55,7 @@ extern char *argv0; /* For changing process name */
#define init_applet ((char *[]) { "magiskpolicy", "supolicy", NULL })
#define init_applet ((char *[]) { "magiskpolicy", "supolicy", NULL })
extern
int
(
*
applet_main
[])
(
int
,
char
*
[]),
(
*
init_applet_main
[])
(
int
,
char
*
[]);
extern
int
(
*
applet_main
[])
(
int
,
char
*
[]),
(
*
init_applet_main
[])
(
int
,
char
*
[]);
extern
char
socket_name
[];
/* Workaround compiler bug pre NDK r13 */
int
create_links
(
const
char
*
bin
,
const
char
*
path
);
int
create_links
(
const
char
*
bin
,
const
char
*
path
);
...
...
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