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

Merge "liblog: Harden log_id check." am: c280143d9b

Browse source 
am: cafb1b7776

Change-Id: I49af30395f3904a9e987b01150417ea449d4da3e
This commit is contained in:
Mark Salyzyn 2017-02-21 23:13:04 +00:00 • committed by android-build-merger
commit 3ecffa294f
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) {