tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vold: fix potential socket leak

Browse source 
Change-Id: Icdb4500fc1e055b058974087e1e518c878dc6b22
Signed-off-by: Kaspter Ju <kaspter@gmail.com>
This commit is contained in:
Kaspter Ju 2012-04-14 10:48:45 +08:00 committed by Jean-Baptiste Queru
parent 5d27f0a714
commit 15bd71f82f
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
NetlinkManager.cpp
View file

@ -65,31 +65,38 @@ int NetlinkManager::start() {
if (setsockopt(mSock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0) {
SLOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
return -1;
goto out;
}
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;
goto out;
}
if (bind(mSock, (struct sockaddr *) &nladdr, sizeof(nladdr)) < 0) {
SLOGE("Unable to bind uevent socket: %s", strerror(errno));
return -1;
goto out;
}
mHandler = new NetlinkHandler(mSock);
if (mHandler->start()) {
SLOGE("Unable to start NetlinkHandler: %s", strerror(errno));
return -1;
goto out;
}
return 0;
out:
close(mSock);
return -1;
}
int NetlinkManager::stop() {
int status = 0;
if (mHandler->stop()) {
SLOGE("Unable to stop NetlinkHandler: %s", strerror(errno));
return -1;
status = -1;
}
delete mHandler;
mHandler = NULL;
@ -97,5 +104,5 @@ int NetlinkManager::stop() {
close(mSock);
mSock = -1;
return 0;
return status;
}