openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Send property_service AVC messages to the kernel audit system" 

This reverts commit 8adb4d9d12.

(cherrypick of d8f9356bec)

Change-Id: I0db29617f323ef31ca5a270d02b7668092e9c9e1
This commit is contained in:
Elliott Hughes 2017-04-14 19:47:05 +00:00
parent fb803d50d0
commit a39515ce8d
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
init/Android.mk
View File

@ -71,7 +71,7 @@ LOCAL_SRC_FILES:= \
service.cpp \
util.cpp \
LOCAL_STATIC_LIBRARIES := libbase libselinux liblog libprocessgroup libnl
LOCAL_STATIC_LIBRARIES := libbase libselinux liblog libprocessgroup
LOCAL_WHOLE_STATIC_LIBRARIES := libcap
LOCAL_MODULE := libinit
LOCAL_SANITIZE := integer
@ -122,7 +122,6 @@ LOCAL_STATIC_LIBRARIES := \
libsparse \
libz \
libprocessgroup \
libnl \
libavb
# Create symlinks.

33
init/log.cpp
View File

@ -17,10 +17,10 @@
#include "log.h"
#include <fcntl.h>
#include <linux/audit.h>
#include <string.h>
#include <linux/audit.h>
#include <netlink/netlink.h>
#include <android-base/logging.h>
#include <selinux/selinux.h>
void InitKernelLogging(char* argv[]) {
@ -40,24 +40,6 @@ void InitKernelLogging(char* argv[]) {
android::base::InitLogging(argv, &android::base::KernelLogger);
}
static void selinux_avc_log(char* buf, size_t buf_len) {
size_t str_len = strnlen(buf, buf_len);
// trim newline at end of string
buf[str_len - 1] = '\0';
struct nl_sock* sk = nl_socket_alloc();
if (sk == NULL) {
return;
}
nl_connect(sk, NETLINK_AUDIT);
int result;
do {
result = nl_send_simple(sk, AUDIT_USER_AVC, 0, buf, str_len);
} while (result == -NLE_INTR);
nl_socket_free(sk);
}
int selinux_klog_callback(int type, const char *fmt, ...) {
android::base::LogSeverity severity = android::base::ERROR;
if (type == SELINUX_WARNING) {
@ -68,15 +50,8 @@ int selinux_klog_callback(int type, const char *fmt, ...) {
char buf[1024];
va_list ap;
va_start(ap, fmt);
int res = vsnprintf(buf, sizeof(buf), fmt, ap);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
if (res <= 0) {
return 0;
}
if (type == SELINUX_AVC) {
selinux_avc_log(buf, sizeof(buf));
} else {
android::base::KernelLogger(android::base::MAIN, severity, "selinux", nullptr, 0, buf);
}
android::base::KernelLogger(android::base::MAIN, severity, "selinux", nullptr, 0, buf);
return 0;
}