ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved conflicts for merge of 5f5d5c8c to gingerbread

Browse source 
Change-Id: Ieee2cd67d33f3e774fcfd96f8a5f67a0374aa873
This commit is contained in:
Nick Kralevich 2010-07-19 15:53:05 -07:00
commit fad7204e9e
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
init/devices.c
View file

@ -58,6 +58,7 @@ static int open_uevent_socket(void)
{ {
struct sockaddr_nl addr; struct sockaddr_nl addr;
int sz = 64*1024; // XXX larger? udev uses 16MB! int sz = 64*1024; // XXX larger? udev uses 16MB!
int on = 1;
int s; int s;
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
@ -70,6 +71,7 @@ static int open_uevent_socket(void)
return -1; return -1;
setsockopt(s, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)); setsockopt(s, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz));
setsockopt(s, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
close(s); close(s);
@ -562,18 +564,42 @@ static void handle_firmware_event(struct uevent *uevent)
#define UEVENT_MSG_LEN 1024 #define UEVENT_MSG_LEN 1024
void handle_device_fd() void handle_device_fd()
{ {
char msg[UEVENT_MSG_LEN+2]; for(;;) {
int n; 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};
while((n = recv(device_fd, msg, UEVENT_MSG_LEN, 0)) > 0) { ssize_t n = recvmsg(device_fd, &hdr, 0);
struct uevent uevent; if (n <= 0) {
break;
}
if(n == UEVENT_MSG_LEN) /* overflow -- discard */ 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;
}
if(n >= UEVENT_MSG_LEN) /* overflow -- discard */
continue; continue;
msg[n] = '\0'; msg[n] = '\0';
msg[n+1] = '\0'; msg[n+1] = '\0';
struct uevent uevent;
parse_event(msg, &uevent); parse_event(msg, &uevent);
handle_device_event(&uevent); handle_device_event(&uevent);