commit 9cb6e501f17ec2a511d942c833ea51a53bcd7249
author Conley Owens <cco3@android.com> Tue Apr 26 15:58:50 2011 -0700
committer Conley Owens <cco3@android.com> Tue Apr 26 15:59:01 2011 -0700
tree e70345ffbee9e14f708f673b17b65d563dd3cdc7
parent b9aa145910e22ed97cb51545bf399e6289bca643
parent c840b382c560829938dd4f6b39d0a34c7961eaa5

Ignore change "Set SO_PASSCRED on the uevent socket." in favor of change
in internal tree.

Change-Id: Ibdf7cf1e1d0ba177d9de813baa6481ddd31d5d9c

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 3191cc7..54da964 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 9fb86ae..29cd88e 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -63,9 +63,13 @@
         return -1;
     }
 
-    if (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0 ||
-        setsockopt(mSock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
-        SLOGE("Unable to set uevent socket options: %s", strerror(errno));
+    if (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0) {
+        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;
     }