ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Skip newlines for SELinux logs"

Browse source
This commit is contained in:
Thiébaud Weksteen 2023-04-05 23:37:51 +00:00 • committed by Gerrit Code Review
commit c3a119caa3
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
init/selinux.cpp
View file

@ -761,15 +761,7 @@ void SelinuxSetEnforcement() {
constexpr size_t kKlogMessageSize = 1024;
void SelinuxAvcLog(char* buf, size_t buf_len) {
CHECK_GT(buf_len, 0u);
size_t str_len = strnlen(buf, buf_len);
// trim newline at end of string
if (buf[str_len - 1] == '\n') {
buf[str_len - 1] = '\0';
}
void SelinuxAvcLog(char* buf) {
struct NetlinkMessage {
nlmsghdr hdr;
char buf[kKlogMessageSize];
@ -835,8 +827,17 @@ int SelinuxKlogCallback(int type, const char* fmt, ...) {
if (length_written <= 0) {
return 0;
}
// libselinux log messages usually contain a new line character, while
// Android LOG() does not expect it. Remove it to avoid empty lines in
// the log buffers.
size_t str_len = strlen(buf);
if (buf[str_len - 1] == '\n') {
buf[str_len - 1] = '\0';
}
if (type == SELINUX_AVC) {
SelinuxAvcLog(buf, sizeof(buf));
SelinuxAvcLog(buf);
} else {
android::base::KernelLogger(android::base::MAIN, severity, "selinux", nullptr, 0, buf);
}