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

Merge "liblog: Harden log_id check."

This commit is contained in:
Mark Salyzyn 2017-02-21 23:06:33 +00:00 committed by Gerrit Code Review
parent b63d47356a d69e801fe8
commit c280143d9b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liblog/logd_reader.c
View File

@ -91,7 +91,7 @@ LIBLOG_HIDDEN struct android_log_transport_read logdLoggerRead = {
static int logdAvailable(log_id_t logId)
{
if (logId > LOG_ID_KERNEL) {
if (logId >= LOG_ID_MAX) {
return -EINVAL;
}
if (logId == LOG_ID_SECURITY) {

2
liblog/logd_writer.c
View File

@ -117,7 +117,7 @@ static void logdClose()
static int logdAvailable(log_id_t logId)
{
if (logId > LOG_ID_SECURITY) {
if (logId >= LOG_ID_MAX || logId == LOG_ID_KERNEL) {
return -EINVAL;
}
if (atomic_load(&logdLoggerWrite.context.sock) < 0) {