summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2011-04-18 15:51:19 -0700
committerNick Kralevich <nnk@google.com>2011-04-26 16:51:47 -0700
commit3e14b0b7c0a181062379516b880d9f99efd02d4f (patch)
tree05c073b11a632c17105b44cc4207d613f07d4d9c
parent1a06edaf4db4e9c520624bcc06e0e13ee470d90e (diff)
downloadvold-froyo.tar.gz
do not merge: vold: Enable the SO_PASSCRED socket optionandroid-cts-2.2_r8android-cts-2.2_r7froyo
Ensure that sender credentials are available when we receive a netlink message. Change-Id: Ia6d2fb192ba11a600e0ee4f56dc41978f7307cf6
-rw-r--r--NetlinkManager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp
index 36db0ff6..29cd88e4 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -50,6 +50,7 @@ NetlinkManager::~NetlinkManager() {
int NetlinkManager::start() {
struct sockaddr_nl nladdr;
int sz = 64 * 1024;
+ int on = 1;
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
@@ -63,7 +64,12 @@ int NetlinkManager::start() {
}
if (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0) {
- SLOGE("Unable to set uevent socket options: %s", strerror(errno));
+ SLOGE("Unable to set uevent socket SO_RECBUFFORCE option: %s", strerror(errno));
+ return -1;
+ }
+
+ if (setsockopt(mSock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
+ SLOGE("Unable to set uevent socket SO_PASSCRED option: %s", strerror(errno));
return -1;
}