summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2011-04-27 09:51:42 -0700
committerAndroid Code Review <code-review@android.com>2011-04-27 09:51:42 -0700
commit282c2ab408d487d0995362d1b9aa97fe30d97ebd (patch)
tree8fb7faf8ccc88f72f0fd40b62160a008963f2ad2 /init
parentf819d0233646668b06de36a787979e3b180d6c48 (diff)
parent8405ec0e7562a370174d9973dd94984c47e49c36 (diff)
downloadsystem_core-282c2ab408d487d0995362d1b9aa97fe30d97ebd.zip
system_core-282c2ab408d487d0995362d1b9aa97fe30d97ebd.tar.gz
system_core-282c2ab408d487d0995362d1b9aa97fe30d97ebd.tar.bz2
Merge "Fold uevent message origin checking from init into libcutils."
Diffstat (limited to 'init')
-rw-r--r--init/devices.c34
1 files changed, 5 insertions, 29 deletions
diff --git a/init/devices.c b/init/devices.c
index e73efdf..eb5d84e 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -33,6 +33,8 @@
#include <asm/page.h>
#include <sys/wait.h>
+#include <cutils/uevent.h>
+
#include "devices.h"
#include "util.h"
#include "log.h"
@@ -589,35 +591,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;