Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 783ffdda authored by Geremy Condra's avatar Geremy Condra Committed by Android Git Automerger
Browse files

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

* commit 'e167d889':
  dumpstate: Add SELinux restorecon call.
parents eb26471c e167d889

cmds/dumpstate/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

cmds/dumpstate/utils.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -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;