commit 602a2ce0e0b64fd1b0db2d4afd077e1c2a8c2a1c
author Junichi Uekawa <uekawa@google.com> Thu Jul 13 20:34:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 20:34:46 2017 +0000
tree 37566c42958afc2e4b84deba4064b669315a99d8
parent 733fe099289c4fd0d1ef4cc960bb392114979c21
parent dfcc7dbad0365e643a9747c837ee310d7f43770e

Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215
am: dfcc7dbad0

Change-Id: I742ebc5174d809fa6f70324659f6e03798710679

NetlinkManager.cpp

diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp
index b5069a6..0ad182e 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -64,8 +64,11 @@
         return -1;
     }
 
-    if (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0) {
-        SLOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
+    // When running in a net/user namespace, SO_RCVBUFFORCE is not available.
+    // Try using SO_RCVBUF first.
+    if ((setsockopt(mSock, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz)) < 0) &&
+        (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0)) {
+        SLOGE("Unable to set uevent socket SO_RCVBUF/SO_RCVBUFFORCE option: %s", strerror(errno));
         goto out;
     }