liblog: __android_log_pmsg_file_write() cleanup
__android_log_pmsg_file_write() will open /dev/pmsg0 if not
already, and will close it if we opened it.
Added atomic access to the android_log_context as insurance.
Fortify and correct pmsg tests.
Test: gTest liblog-unit-tests --gtest_filter=liblog.__android_log_pmsg_file_*
Bug: 31958686
Change-Id: I2cf6f971b6968938f471fda67367efe20dae3004
diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index 563b5c7..71ff075 100644
--- a/liblog/logd_reader.c
+++ b/liblog/logd_reader.c
@@ -482,17 +482,17 @@
struct sigaction old_sigaction;
unsigned int old_alarm = 0;
char buffer[256], *cp, c;
- int e, ret, remaining;
-
- int sock = transp->context.sock;
- if (sock > 0) {
- return sock;
- }
+ int e, ret, remaining, sock;
if (!logger_list) {
return -EINVAL;
}
+ sock = atomic_load(&transp->context.sock);
+ if (sock > 0) {
+ return sock;
+ }
+
sock = socket_local_client("logdr",
ANDROID_SOCKET_NAMESPACE_RESERVED,
SOCK_SEQPACKET);
@@ -587,7 +587,11 @@
return ret;
}
- return transp->context.sock = sock;
+ ret = atomic_exchange(&transp->context.sock, sock);
+ if ((ret > 0) && (ret != sock)) {
+ close(ret);
+ }
+ return sock;
}
/* Read from the selected logs */
@@ -662,8 +666,8 @@
static void logdClose(struct android_log_logger_list *logger_list __unused,
struct android_log_transport_context *transp)
{
- if (transp->context.sock > 0) {
- close (transp->context.sock);
- transp->context.sock = -1;
+ int sock = atomic_exchange(&transp->context.sock, -1);
+ if (sock > 0) {
+ close (sock);
}
}