am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
* commit '2f0a1d66585fb44f59d913d3417422486ef10225':
Validate asec names.
diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp
index 29cd88e..dbba303 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -64,32 +64,39 @@
}
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;
+ SLOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
+ 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 @@
close(mSock);
mSock = -1;
- return 0;
+ return status;
}