ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a3d3e137: Merge "dumpstate: Add SELinux restorecon call."

Browse Source 
* commit 'a3d3e137f473a965fefced9670e3b0c6b5f7f791':
  dumpstate: Add SELinux restorecon call.
This commit is contained in:
Geremy Condra 2013-04-04 23:42:15 -07:00 committed by Android Git Automerger
commit e167d889e4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/dumpstate/Android.mk
View File

@ -9,7 +9,7 @@ LOCAL_SRC_FILES := dumpstate.c utils.c
LOCAL_MODULE := dumpstate LOCAL_MODULE := dumpstate
LOCAL_SHARED_LIBRARIES := libcutils LOCAL_SHARED_LIBRARIES := libcutils libselinux
ifdef BOARD_LIB_DUMPSTATE ifdef BOARD_LIB_DUMPSTATE
LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE) LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE)

5
cmds/dumpstate/utils.c
View File

@ -38,6 +38,8 @@
#include <cutils/sockets.h> #include <cutils/sockets.h>
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include <selinux/android.h>
#include "dumpstate.h" #include "dumpstate.h"
/* list of native processes to include in the native dumps */ /* list of native processes to include in the native dumps */
@ -467,6 +469,9 @@ const char *dump_traces() {
if (!mkdir(anr_traces_dir, 0775)) { if (!mkdir(anr_traces_dir, 0775)) {
chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM); chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM);
chmod(anr_traces_dir, 0775); chmod(anr_traces_dir, 0775);
if (selinux_android_restorecon(anr_traces_dir) == -1) {
fprintf(stderr, "restorecon failed for %s: %s\n", anr_traces_dir, strerror(errno));
}
} else if (errno != EEXIST) { } else if (errno != EEXIST) {
fprintf(stderr, "mkdir(%s): %s\n", anr_traces_dir, strerror(errno)); fprintf(stderr, "mkdir(%s): %s\n", anr_traces_dir, strerror(errno));
return NULL; return NULL;