Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ecffa29 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

am: cafb1b77

Change-Id: I49af30395f3904a9e987b01150417ea449d4da3e
parents dd01d2f7 cafb1b77

liblog/logd_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

liblog/logd_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {