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

liblog: add __android_log_config_*_close()

Browse source 
Add __android_log_config_read_close() and
__android_log_config_write_close().  Fortify the list macros
to detect for list corruption, looking for entries pointing
to themselves, deleted entries in list.

Test: gTest liblog-unit-tests
Bug: 27405083
Change-Id: I33e8a0cae7e202f1989ddd7c2a96752b44c8e746
This commit is contained in:
Mark Salyzyn 2016-03-08 16:18:26 -08:00
parent cf983bcbae
commit 96432fc665
4 changed files with 58 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
liblog/config_read.c
View file

@ -60,3 +60,15 @@ LIBLOG_HIDDEN void __android_log_config_read() {
__android_log_add_transport(&__android_log_persist_read, &pmsgLoggerRead); __android_log_add_transport(&__android_log_persist_read, &pmsgLoggerRead);
#endif #endif
} }
LIBLOG_HIDDEN void __android_log_config_read_close() {
struct android_log_transport_read *transport;
struct listnode *n;
read_transport_for_each_safe(transport, n, &__android_log_transport_read) {
list_remove(&transport->node);
}
read_transport_for_each_safe(transport, n, &__android_log_persist_read) {
list_remove(&transport->node);
}
}

25
liblog/config_read.h
View file

@ -28,22 +28,31 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_read;
#define read_transport_for_each(transp, transports) \ #define read_transport_for_each(transp, transports) \
for ((transp) = node_to_item((transports)->next, \ for ((transp) = node_to_item((transports)->next, \
struct android_log_transport_read, node); \ struct android_log_transport_read, node); \
((transp) != node_to_item(transports, \ ((transp) != node_to_item((transports), \
struct android_log_transport_read, node)); \ struct android_log_transport_read, \
node)) && \
((transp) != node_to_item((transp)->node.next, \
struct android_log_transport_read, \
node)); \
(transp) = node_to_item((transp)->node.next, \ (transp) = node_to_item((transp)->node.next, \
struct android_log_transport_read, node)) \ struct android_log_transport_read, node))
#define read_transport_for_each_safe(transp, n, transports) \ #define read_transport_for_each_safe(transp, n, transports) \
for ((transp) = node_to_item((transports)->next, \ for ((transp) = node_to_item((transports)->next, \
struct android_log_transport_read, node), \ struct android_log_transport_read, node), \
(n) = (transp)->node.next; \ (n) = (transp)->node.next; \
((transp) != node_to_item(transports, \ ((transp) != node_to_item((transports), \
struct android_log_transport_read, node)); \ struct android_log_transport_read, \
(transp) = node_to_item(n, struct android_log_transport_read, node), \ node)) && \
((transp) != node_to_item((n), struct android_log_transport_read, \
node)); \
(transp) = node_to_item((n), struct android_log_transport_read, \
node), \
(n) = (transp)->node.next) (n) = (transp)->node.next)
LIBLOG_HIDDEN void __android_log_config_read(); LIBLOG_HIDDEN void __android_log_config_read();
LIBLOG_HIDDEN void __android_log_config_read_close();
__END_DECLS __END_DECLS

14
liblog/config_write.c
View file

@ -64,3 +64,17 @@ LIBLOG_HIDDEN void __android_log_config_write() {
__android_log_add_transport(&__android_log_transport_write, &fakeLoggerWrite); __android_log_add_transport(&__android_log_transport_write, &fakeLoggerWrite);
#endif #endif
} }
LIBLOG_HIDDEN void __android_log_config_write_close() {
struct android_log_transport_write *transport;
struct listnode *n;
write_transport_for_each_safe(transport, n, &__android_log_transport_write) {
transport->logMask = 0;
list_remove(&transport->node);
}
write_transport_for_each_safe(transport, n, &__android_log_persist_write) {
transport->logMask = 0;
list_remove(&transport->node);
}
}

21
liblog/config_write.h
View file

@ -29,21 +29,30 @@ extern LIBLOG_HIDDEN struct listnode __android_log_persist_write;
#define write_transport_for_each(transp, transports) \ #define write_transport_for_each(transp, transports) \
for ((transp) = node_to_item((transports)->next, \ for ((transp) = node_to_item((transports)->next, \
struct android_log_transport_write, node); \ struct android_log_transport_write, node); \
((transp) != node_to_item(transports, \ ((transp) != node_to_item((transports), \
struct android_log_transport_write, node)); \ struct android_log_transport_write, \
node)) && \
((transp) != node_to_item((transp)->node.next, \
struct android_log_transport_write, \
node)); \
(transp) = node_to_item((transp)->node.next, \ (transp) = node_to_item((transp)->node.next, \
struct android_log_transport_write, node)) \ struct android_log_transport_write, node))
#define write_transport_for_each_safe(transp, n, transports) \ #define write_transport_for_each_safe(transp, n, transports) \
for ((transp) = node_to_item((transports)->next, \ for ((transp) = node_to_item((transports)->next, \
struct android_log_transport_write, node), \ struct android_log_transport_write, node), \
(n) = (transp)->node.next; \ (n) = (transp)->node.next; \
((transp) != node_to_item(transports, \ ((transp) != node_to_item((transports), \
struct android_log_transport_write, node)); \ struct android_log_transport_write, \
(transp) = node_to_item(n, struct android_log_transport_write, node), \ node)) && \
((transp) != node_to_item((n), struct android_log_transport_write, \
node)); \
(transp) = node_to_item((n), struct android_log_transport_write, \
node), \
(n) = (transp)->node.next) (n) = (transp)->node.next)
LIBLOG_HIDDEN void __android_log_config_write(); LIBLOG_HIDDEN void __android_log_config_write();
LIBLOG_HIDDEN void __android_log_config_write_close();
__END_DECLS __END_DECLS