Skip to content

Android NDK9e / Android 4.3 fixes and added Logcat output :) #1

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Android NDK9e / Android 4.3 fixes and added Logcat output :) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18a3f1f
Android NDK9 + Logcat fixes
Jan 4, 2014
8a2f151
Android NDK9 + Logcat fixes V2
Jan 4, 2014
47e0926
README Update
Jan 4, 2014
50be234
Additional NDK9e fixes and cleanups.
Jan 4, 2014
2633b71
README fixes.
Jan 4, 2014
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
22 changes: 5 additions & 17 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,19 @@ Android NDK
= build the hijack tool =
```
cd hijack
cd jni
ndk-build
cd ..
adb push libs/armeabi/hijack
cd ..
```

= build the instrumentation base code =

```
cd instruments
cd base
cd jni
ndk-build
cd ..
adb push libs/armeabi/hijack /data/local/tmp/
adb shell chmod 755 /data/local/tmp/hijack
cd ..
```

= build instrumentation example =

```
cd example
cd jni
ndk-build
cd ..
adb push libs/armeabi/libexample.so /data/local/tmp/
adb shell chmod 755 /data/local/tmp/libexample.so
```

=== How to Run ===
Expand All @@ -78,7 +65,8 @@ su
cd /data/local/tmp
# GET PID from com.android.phone
./hijack -d -p PID -l /data/local/tmp/libexample.so
cat adbi_example.log
exit
adb logcat (see log entries hook-epoll)
```

output should look similar to:
Expand Down
14 changes: 7 additions & 7 deletions instruments/base/hook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ int hook_direct(struct hook_t *h, unsigned int addr, void *hookf)
{
int i;

log("addr = %x\n", addr)
log("hookf = %x\n", hookf)
log("addr = %x\n", (unsigned int)addr)
log("hookf = %x\n", (unsigned int)hookf)

if ((addr % 4 == 0 && (unsigned int)hookf % 4 != 0) || (addr % 4 != 0 && (unsigned int)hookf % 4 == 0))
log("addr 0x%x and hook 0x%x\n don't match!\n", addr, hookf)
log("addr 0x%x and hook 0x%x\n don't match!\n", (unsigned int)addr, (unsigned int)hookf)

//log("ARM\n")
h->thumb = 0;
Expand Down Expand Up @@ -81,11 +81,11 @@ int hook(struct hook_t *h, int pid, char *libname, char *funcname, void *hook_ar
return 0;
}

log("hooking: %s = 0x%x ", funcname, addr)
log("hooking: %s = 0x%x ", funcname, (unsigned int)addr)
strncpy(h->name, funcname, sizeof(h->name)-1);

if (addr % 4 == 0) {
log("ARM using 0x%x\n", hook_arm)
log("ARM using 0x%x\n", (unsigned int)hook_arm)
h->thumb = 0;
h->patch = (unsigned int)hook_arm;
h->orig = addr;
Expand All @@ -99,9 +99,9 @@ int hook(struct hook_t *h, int pid, char *libname, char *funcname, void *hook_ar
}
else {
if ((unsigned long int)hook_thumb % 4 == 0)
log("warning hook is not thumb 0x%x\n", hook_thumb)
log("warning hook is not thumb 0x%x\n", (unsigned int)hook_thumb)
h->thumb = 1;
log("THUMB using 0x%x\n", hook_thumb)
log("THUMB using 0x%x\n", (unsigned int)hook_thumb)
h->patch = (unsigned int)hook_thumb;
h->orig = addr;
h->jumpt[1] = 0xb4;
Expand Down
12 changes: 8 additions & 4 deletions instruments/example/epoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* License: LGPL v2.1
*
*/
// Modified by B.Kerler to support Android Logcat + NDK9

#define _GNU_SOURCE
#include <stdio.h>
Expand All @@ -30,7 +31,10 @@
#include "../base/base.h"

#undef log
#include <android/log.h>

#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "hook-epoll", __VA_ARGS__))
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, "hook-epoll", __VA_ARGS__))
#define log(...) \
{FILE *fp = fopen("/data/local/tmp/adbi_example.log", "a+");\
fprintf(fp, __VA_ARGS__);\
Expand All @@ -56,7 +60,7 @@ extern int my_epoll_wait_arm(int epfd, struct epoll_event *events, int maxevents
*/
static void my_log(char *msg)
{
log(msg)
LOGI("%s",msg);
}

int my_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
Expand All @@ -68,10 +72,10 @@ int my_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeo
int res = orig_epoll_wait(epfd, events, maxevents, timeout);
if (counter) {
hook_postcall(&eph);
log("epoll_wait() called\n");
LOGI("epoll_wait() called\n");
counter--;
if (!counter)
log("removing hook for epoll_wait()\n");
LOGI("removing hook for epoll_wait()\n");
}

return res;
Expand All @@ -81,7 +85,7 @@ void my_init(void)
{
counter = 3;

log("%s started\n", __FILE__)
LOGI("%s started\n", __FILE__);

set_logfunction(my_log);

Expand Down
1 change: 1 addition & 0 deletions instruments/example/epoll_arm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <sys/types.h>
#include <sys/epoll.h>
#include <android/log.h>

extern int my_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout);

Expand Down
5 changes: 2 additions & 3 deletions instruments/example/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE := libexample
LOCAL_SRC_FILES := ../epoll.c ../epoll_arm.c.arm
LOCAL_LDLIBS := -L./libs -ldl -ldvm -lbase
LOCAL_LDLIBS := -Wl,--start-group ../../base/obj/local/armeabi/libbase.a -Wl,--end-group
LOCAL_SRC_FILES := ../epoll.c ../epoll_arm.c.arm ../../base/util.c ../../base/hook.c ../../base/base.c
LOCAL_LDLIBS := -L./libs -ldl -llog
LOCAL_CFLAGS := -g

include $(BUILD_SHARED_LIBRARY)