diff options
| author | Nathan Harold <nharold@google.com> | 2018-05-10 14:15:36 -0700 |
|---|---|---|
| committer | Nathan Harold <nharold@google.com> | 2018-05-10 14:41:45 -0700 |
| commit | a397abdf91421546057f9462fb47e4813847bd65 (patch) | |
| tree | cd525f87e3f28a9de5044dd2951631979867e315 /server/XfrmController.cpp | |
| parent | cc48dd2749a2c67f0538d435f7d9e08ca84b3cb0 (diff) | |
| download | netd-a397abdf91421546057f9462fb47e4813847bd65.tar.gz | |
Fix Errno Sign For XfrmController
XfrmController functions and status all use
positive errno values; however in the instances
where -errno is returned, namely for calls to
sendNetlinkRequest(), the sign is incorrect,
which leads to errors not being properly processed.
Bug: 62778032
Test: TestXfrmControllerInit on AOSP/master - marlin
Change-Id: Ie5ac8f032af0021e1dc22b523dec801d9c62bf41
Diffstat (limited to 'server/XfrmController.cpp')
| -rw-r--r-- | server/XfrmController.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp index d762878e..8a891eb7 100644 --- a/server/XfrmController.cpp +++ b/server/XfrmController.cpp @@ -1346,7 +1346,8 @@ int XfrmController::addVirtualTunnelInterface(const std::string& deviceName, flags |= NLM_F_EXCL | NLM_F_CREATE; } - int ret = sendNetlinkRequest(action, flags, iov, ARRAY_SIZE(iov), nullptr); + // sendNetlinkRequest returns -errno + int ret = -1 * sendNetlinkRequest(action, flags, iov, ARRAY_SIZE(iov), nullptr); if (ret) { ALOGE("Error in %s virtual tunnel interface. Error Code: %d", isUpdate ? "updating" : "adding", ret); @@ -1383,7 +1384,8 @@ int XfrmController::removeVirtualTunnelInterface(const std::string& deviceName) uint16_t action = RTM_DELLINK; uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; - int ret = sendNetlinkRequest(action, flags, iov, ARRAY_SIZE(iov), nullptr); + // sendNetlinkRequest returns -errno + int ret = -1 * sendNetlinkRequest(action, flags, iov, ARRAY_SIZE(iov), nullptr); if (ret) { ALOGE("Error in removing virtual tunnel interface %s. Error Code: %d", iflaIfNameStrValue, ret); |