commit a0272d2c18ff992f78d99d97ec9e9985b93d3b78
author android-merger <android-build@android.com> Fri Jul 08 12:29:24 2011 -0700
committer android-merger <android-build@android.com> Fri Jul 08 12:29:24 2011 -0700
tree e9fe4391999ed244fbad11a0e15034889b3aa3d7
parent 93f032122f0d45d565f899cc4c8f229e4ee27e89
parent 1c55ddb75833b6bb6b7ebafd0fdf4f47596a4505

reset, and keep history

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index ce5b892..0ac1a0c 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -186,6 +186,11 @@
         part_num = 1;
     }
 
+    if (part_num > MAX_PARTITIONS || part_num < 1) {
+        SLOGW("Invalid 'PARTN' value");
+        part_num = 1;
+    }
+
     if (part_num > mDiskNumParts) {
         mDiskNumParts = part_num;
     }

NetlinkManager.cpp

diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp
index 36db0ff..29cd88e 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -50,6 +50,7 @@
 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 @@
     }
 
     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;
     }