commit 0ee4518620f50df88e56d95d3ab5a02eca62aafa
author Geremy Condra <gcondra@google.com> Thu Mar 29 16:56:24 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 29 16:56:24 2012 -0700
tree c8e045c0bacbc09b8b6c625187582cace30f20af
parent c8583c680a62dcd8f66952a71cd986f477aa1241
parent d98533a01213ef8d4ef9a644074ada200cdfc926

Merge "Added netlink failure logging to NetlinkListener.cpp"

libsysutils/EventLogTags.logtags

diff --git a/libsysutils/EventLogTags.logtags b/libsysutils/EventLogTags.logtags
index 27785f0..7aa5cad 100644
--- a/libsysutils/EventLogTags.logtags
+++ b/libsysutils/EventLogTags.logtags
@@ -2,3 +2,4 @@
 
 # FrameworkListener dispatchCommand overflow
 78001 dispatchCommand_overflow
+65537 netlink_failure (uid|1)

libsysutils/src/NetlinkListener.cpp

diff --git a/libsysutils/src/NetlinkListener.cpp b/libsysutils/src/NetlinkListener.cpp
index e67b5c6..9c447ca 100644
--- a/libsysutils/src/NetlinkListener.cpp
+++ b/libsysutils/src/NetlinkListener.cpp
@@ -45,9 +45,13 @@
 {
     int socket = cli->getSocket();
     ssize_t count;
+    uid_t uid = -1;
 
-    count = TEMP_FAILURE_RETRY(uevent_kernel_multicast_recv(socket, mBuffer, sizeof(mBuffer)));
+    count = TEMP_FAILURE_RETRY(uevent_kernel_multicast_uid_recv(
+                                       socket, mBuffer, sizeof(mBuffer), &uid));
     if (count < 0) {
+        if (uid > 0)
+            LOG_EVENT_INT(65537, uid);
         SLOGE("recvmsg failed (%s)", strerror(errno));
         return false;
     }