diff options
author | Nick Kralevich <nnk@google.com> | 2011-04-27 10:00:34 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-27 10:00:34 -0700 |
commit | 3268eda4dc028e338728d822e18974ed6e7cd639 (patch) | |
tree | 3ad9e7e199cb4e10773e7c7a3b3393cecbc4f53e /init | |
parent | 2084da4c0fc9cb11d75108d385cb1237114aa757 (diff) | |
parent | e3ab42457077ec2a66bac553e59a7fee08d4fa9e (diff) | |
download | system_core-3268eda4dc028e338728d822e18974ed6e7cd639.tar.gz system_core-3268eda4dc028e338728d822e18974ed6e7cd639.tar.bz2 system_core-3268eda4dc028e338728d822e18974ed6e7cd639.zip |
am e3ab4245: am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
* commit 'e3ab42457077ec2a66bac553e59a7fee08d4fa9e':
Fold uevent message origin checking from init into libcutils.
Diffstat (limited to 'init')
-rw-r--r-- | init/devices.c | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/init/devices.c b/init/devices.c index bc36ac15..a200c95e 100644 --- a/init/devices.c +++ b/init/devices.c @@ -34,6 +34,8 @@ #include <asm/page.h> #include <sys/wait.h> +#include <cutils/uevent.h> + #include "devices.h" #include "util.h" #include "log.h" @@ -770,35 +772,9 @@ static void handle_firmware_event(struct uevent *uevent) #define UEVENT_MSG_LEN 1024 void handle_device_fd() { - for(;;) { - char msg[UEVENT_MSG_LEN+2]; - char cred_msg[CMSG_SPACE(sizeof(struct ucred))]; - struct iovec iov = {msg, sizeof(msg)}; - struct sockaddr_nl snl; - struct msghdr hdr = {&snl, sizeof(snl), &iov, 1, cred_msg, sizeof(cred_msg), 0}; - - ssize_t n = recvmsg(device_fd, &hdr, 0); - if (n <= 0) { - break; - } - - if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) { - /* ignoring non-kernel netlink multicast message */ - continue; - } - - struct cmsghdr * cmsg = CMSG_FIRSTHDR(&hdr); - if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) { - /* no sender credentials received, ignore message */ - continue; - } - - struct ucred * cred = (struct ucred *)CMSG_DATA(cmsg); - if (cred->uid != 0) { - /* message from non-root user, ignore */ - continue; - } - + char msg[UEVENT_MSG_LEN+2]; + int n; + while ((n = uevent_checked_recv(device_fd, msg, UEVENT_MSG_LEN)) > 0) { if(n >= UEVENT_MSG_LEN) /* overflow -- discard */ continue; |