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

Merge "liblog: log reader validate headers"

Browse source 
am: 0321476fe2

* commit '0321476fe2aedf9a0b960508b52681ee5f1d555e':
  liblog: log reader validate headers

Change-Id: I21832a3908161e489a04a127508e2339e7f29bce
This commit is contained in:
Mark Salyzyn 2016-05-18 14:25:26 +00:00 • committed by android-build-merger
commit 0a7dec432c
1 changed files with 51 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
liblog/logger_read.c
View file

@ -341,6 +341,43 @@ LIBLOG_ABI_PUBLIC struct logger_list *android_logger_list_open(
return logger_list; return logger_list;
} }
/* Validate log_msg packet, read function has already been null checked */
static int android_transport_read(struct android_log_logger_list *logger_list,
struct android_log_transport_context *transp,
struct log_msg *log_msg)
{
int ret = (*transp->transport->read)(logger_list, transp, log_msg);
if (ret > (int)sizeof(*log_msg)) {
ret = sizeof(*log_msg);
}
transp->ret = ret;
/* propagate errors, or make sure len & hdr_size members visible */
if (ret < (int)(sizeof(log_msg->entry.len) +
sizeof(log_msg->entry.hdr_size))) {
if (ret >= (int)sizeof(log_msg->entry.len)) {
log_msg->entry.len = 0;
}
return ret;
}
/* hdr_size correction (logger_entry -> logger_entry_v2+ conversion) */
if (log_msg->entry_v2.hdr_size == 0) {
log_msg->entry_v2.hdr_size = sizeof(struct logger_entry);
}
/* len validation */
if (ret <= log_msg->entry_v2.hdr_size) {
log_msg->entry.len = 0;
} else {
log_msg->entry.len = ret - log_msg->entry_v2.hdr_size;
}
return ret;
}
/* Read from the selected logs */ /* Read from the selected logs */
LIBLOG_ABI_PUBLIC int android_logger_list_read(struct logger_list *logger_list, LIBLOG_ABI_PUBLIC int android_logger_list_read(struct logger_list *logger_list,
struct log_msg *log_msg) struct log_msg *log_msg)
@ -378,7 +415,7 @@ LIBLOG_ABI_PUBLIC int android_logger_list_read(struct logger_list *logger_list,
} else if ((logger_list_internal->mode & } else if ((logger_list_internal->mode &
ANDROID_LOG_NONBLOCK) || ANDROID_LOG_NONBLOCK) ||
!transp->transport->poll) { !transp->transport->poll) {
retval = transp->ret = (*transp->transport->read)( retval = android_transport_read(
logger_list_internal, logger_list_internal,
transp, transp,
&transp->logMsg); &transp->logMsg);
@ -397,7 +434,7 @@ LIBLOG_ABI_PUBLIC int android_logger_list_read(struct logger_list *logger_list,
} }
retval = transp->ret = pollval; retval = transp->ret = pollval;
} else if (pollval > 0) { } else if (pollval > 0) {
retval = transp->ret = (*transp->transport->read)( retval = android_transport_read(
logger_list_internal, logger_list_internal,
transp, transp,
&transp->logMsg); &transp->logMsg);
@ -434,16 +471,22 @@ LIBLOG_ABI_PUBLIC int android_logger_list_read(struct logger_list *logger_list,
if (!oldest) { if (!oldest) {
return ret; return ret;
} }
memcpy(log_msg, &oldest->logMsg, oldest->logMsg.entry.len + // ret is a positive value less than sizeof(struct log_msg)
(oldest->logMsg.entry.hdr_size ? ret = oldest->ret;
oldest->logMsg.entry.hdr_size : if (ret < oldest->logMsg.entry.hdr_size) {
sizeof(struct logger_entry))); // zero truncated header fields.
memset(log_msg, 0,
(oldest->logMsg.entry.hdr_size > sizeof(oldest->logMsg) ?
sizeof(oldest->logMsg) :
oldest->logMsg.entry.hdr_size));
}
memcpy(log_msg, &oldest->logMsg, ret);
oldest->logMsg.entry.len = 0; /* Mark it as copied */ oldest->logMsg.entry.len = 0; /* Mark it as copied */
return oldest->ret; return ret;
} }
/* if only one, no need to copy into transport_context and merge-sort */ /* if only one, no need to copy into transport_context and merge-sort */
return (transp->transport->read)(logger_list_internal, transp, log_msg); return android_transport_read(logger_list_internal, transp, log_msg);
} }
/* Close all the logs */ /* Close all the logs */