commit d3fe154610dbc56e02068047126571ebae9bbab9
author Maciej Żenczykowski <maze@google.com> Thu Feb 23 03:56:45 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Wed Apr 19 11:53:38 2023 +0000
tree 10b107982ab09e3d38b8cd49f95efd08dd2fcecd
parent 11dee200f9c984b7ab4467cac597ba669adbe9e2

get rid of needless use of NONEXISTENT_COOKIE which is simply 0

The random grab bag of stuff in BpfUtils.h is weird,
and I'm trying to trim it down.

Since this is coming from the kernel, 0 meaning error / no socket
is actually kernel api and thus guaranteed.

IMHO if (!cookie) is also clearer to read.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I433dfca5695a04a42d632b7e0c2434db26c4ed00

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index 2b773c9..8081d12 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -32,7 +32,6 @@
 namespace net {
 
 using base::unique_fd;
-using bpf::NONEXISTENT_COOKIE;
 using bpf::getSocketCookie;
 using bpf::retrieveProgram;
 using netdutils::Status;
@@ -185,7 +184,7 @@
     }
 
     uint64_t sock_cookie = getSocketCookie(sockFd);
-    if (sock_cookie == NONEXISTENT_COOKIE) return -errno;
+    if (!sock_cookie) return -errno;
 
     UidTagValue newKey = {.uid = (uint32_t)chargeUid, .tag = tag};
 
@@ -249,7 +248,7 @@
 
 int BpfHandler::untagSocket(int sockFd) {
     uint64_t sock_cookie = getSocketCookie(sockFd);
-    if (sock_cookie == NONEXISTENT_COOKIE) return -errno;
+    if (!sock_cookie) return -errno;
 
     if (!mCookieTagMap.isValid()) return -EPERM;
     base::Result<void> res = mCookieTagMap.deleteValue(sock_cookie);