commit 5be6602e975a26c9a47dade4b161c295d165b825
author Nathan Harold <nharold@google.com> Thu May 10 14:15:36 2018 -0700
committer Nathan Harold <nharold@google.com> Mon May 14 13:09:29 2018 -0700
tree 07fb063633f580f09e5f91e3e6d0f62fa3df24f3
parent b6bd53e45633f1c7a39631dc2cba223b0829c441

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
Merged-In: Ie5ac8f032af0021e1dc22b523dec801d9c62bf41
Change-Id: Ie5ac8f032af0021e1dc22b523dec801d9c62bf41
(cherry picked from commit a397abdf91421546057f9462fb47e4813847bd65)

server/XfrmController.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index 2a2382f..e229cf8 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -1346,7 +1346,8 @@
         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 @@
     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);