diff options
author | Nick Kralevich <nnk@google.com> | 2011-04-29 16:49:22 -0700 |
---|---|---|
committer | Nick Kralevich <nnk@google.com> | 2011-04-29 16:49:22 -0700 |
commit | 531312e491079b7d62612fa35b64e8398f1b3283 (patch) | |
tree | 8ffb6f03f55a912e68ded1e5bc388a7ac1a4e6b1 /libsysutils | |
parent | fdbbdc4ecda05e028ec41352b373d8232f600ccc (diff) | |
download | system_core-531312e491079b7d62612fa35b64e8398f1b3283.zip system_core-531312e491079b7d62612fa35b64e8398f1b3283.tar.gz system_core-531312e491079b7d62612fa35b64e8398f1b3283.tar.bz2 |
NetlinkListener: eliminate duplicate code
The checks in this code duplicate uevent_checked_recv().
Use that instead.
Change-Id: I2c48bcf4372f0975c27a63d929cae73e16422faf
Diffstat (limited to 'libsysutils')
-rw-r--r-- | libsysutils/src/NetlinkListener.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libsysutils/src/NetlinkListener.cpp b/libsysutils/src/NetlinkListener.cpp index ddf6537..b24a45e 100644 --- a/libsysutils/src/NetlinkListener.cpp +++ b/libsysutils/src/NetlinkListener.cpp @@ -22,6 +22,7 @@ #define LOG_TAG "NetlinkListener" #include <cutils/log.h> +#include <cutils/uevent.h> #include <sysutils/NetlinkListener.h> #include <sysutils/NetlinkEvent.h> @@ -34,35 +35,13 @@ bool NetlinkListener::onDataAvailable(SocketClient *cli) { int socket = cli->getSocket(); ssize_t count; - char cred_msg[CMSG_SPACE(sizeof(struct ucred))]; - struct sockaddr_nl snl; - struct iovec iov = {mBuffer, sizeof(mBuffer)}; - struct msghdr hdr = {&snl, sizeof(snl), &iov, 1, cred_msg, sizeof(cred_msg), 0}; - count = TEMP_FAILURE_RETRY(recvmsg(socket, &hdr, 0)); + count = TEMP_FAILURE_RETRY(uevent_checked_recv(socket, mBuffer, sizeof(mBuffer))); if (count < 0) { SLOGE("recvmsg failed (%s)", strerror(errno)); return false; } - if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) { - SLOGE("ignoring non-kernel netlink multicast message"); - return false; - } - - struct cmsghdr * cmsg = CMSG_FIRSTHDR(&hdr); - - if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) { - SLOGE("ignoring message with no sender credentials"); - return false; - } - - struct ucred * cred = (struct ucred *)CMSG_DATA(cmsg); - if (cred->uid != 0) { - SLOGE("ignoring message from non-root UID %d", cred->uid); - return false; - } - NetlinkEvent *evt = new NetlinkEvent(); if (!evt->decode(mBuffer, count)) { SLOGE("Error decoding NetlinkEvent"); |