From cf7369a45845466dffba252d62364f49dfc3b30d Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 7 Jul 2011 14:54:01 -0700 Subject: [PATCH] Revert "vold: Enable the SO_PASSCRED socket option" This reverts commit c51920c82463b240e2be0430849837d6fdc5352e. --- NetlinkManager.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp index 29cd88e..36db0ff 100644 --- a/NetlinkManager.cpp +++ b/NetlinkManager.cpp @@ -50,7 +50,6 @@ 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; @@ -64,12 +63,7 @@ int NetlinkManager::start() { } 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)); + SLOGE("Unable to set uevent socket options: %s", strerror(errno)); return -1; }