0484b3b575
A mixture of fixes and cleanup for LogKlog.cpp and friends. - sscanf calls strlen. Check if the string is missing a nul terminator, if it is, do not call sscanf. - replace NULL with nullptr for stronger typechecking. - pass by reference for simpler code. - Use ssize_t where possible to check for negative values. - fix FastCmp to add some validity checking since ASAN reports that callers are not making sure pre-conditions are met. - add fasticmp templates for completeness. - if the buffer is too small to contain a meaningful time, do not call down to log_time::strptime() because it does not limit its accesses to the buffer boundaries, instead stopping at a terminating nul or invalid match. - move strnstr to LogUtils.h, drop size checking of needle and clearly report the list of needles used with android::strnstr - replace 'sizeof(static const char[]) - 1' with strlen. Test: gTest liblog-unit-test, logd-unit-tests & logcat-unit-tests Bug: 30792935 Bug: 36536248 Bug: 35468874 Bug: 34949125 Bug: 34606909 Bug: 36075298 Bug: 36608728 Change-Id: I161bf03ba029050e809b31cceef03f729d318866
65 lines
2 KiB
C++
65 lines
2 KiB
C++
/*
|
|
* Copyright (C) 2014 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _LOGD_LOG_KLOG_H__
|
|
#define _LOGD_LOG_KLOG_H__
|
|
|
|
#include <private/android_logger.h>
|
|
#include <sysutils/SocketListener.h>
|
|
|
|
class LogBuffer;
|
|
class LogReader;
|
|
|
|
class LogKlog : public SocketListener {
|
|
LogBuffer* logbuf;
|
|
LogReader* reader;
|
|
const log_time signature;
|
|
// Set once thread is started, separates KLOG_ACTION_READ_ALL
|
|
// and KLOG_ACTION_READ phases.
|
|
bool initialized;
|
|
// Used during each of the above phases to control logging.
|
|
bool enableLogging;
|
|
// set if we are also running auditd, to filter out audit reports from
|
|
// our copy of the kernel log
|
|
bool auditd;
|
|
|
|
static log_time correction;
|
|
|
|
public:
|
|
LogKlog(LogBuffer* buf, LogReader* reader, int fdWrite, int fdRead,
|
|
bool auditd);
|
|
int log(const char* buf, ssize_t len);
|
|
void synchronize(const char* buf, ssize_t len);
|
|
|
|
bool isMonotonic() {
|
|
return logbuf->isMonotonic();
|
|
}
|
|
static void convertMonotonicToReal(log_time& real) {
|
|
real += correction;
|
|
}
|
|
static void convertRealToMonotonic(log_time& real) {
|
|
real -= correction;
|
|
}
|
|
|
|
protected:
|
|
void sniffTime(log_time& now, const char*& buf, ssize_t len, bool reverse);
|
|
pid_t sniffPid(const char*& buf, ssize_t len);
|
|
void calculateCorrection(const log_time& monotonic, const char* real_string,
|
|
ssize_t len);
|
|
virtual bool onDataAvailable(SocketClient* cli);
|
|
};
|
|
|
|
#endif
|