LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[CLATJ#30] Not allow tagSocket() to tag with uid AID_CLAT"

Browse Source
This commit is contained in:
Maciej Żenczykowski
2022-03-05 08:33:33 +00:00
committed by Gerrit Code Review
parent 171db11c5f 436547e368
commit edf80c2da8
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netd/BpfHandler.cpp
View File

@@ -134,6 +134,15 @@ int BpfHandler::tagSocket(int sockFd, uint32_t tag, uid_t chargeUid, uid_t realU
return -EPERM; return -EPERM;
} }
// Note that tagging the socket to AID_CLAT is only implemented in JNI ClatCoordinator.
// The process is not allowed to tag socket to AID_CLAT via tagSocket() which would cause
// process data usage accounting to be bypassed. Tagging AID_CLAT is used for avoiding counting
// CLAT traffic data usage twice. See packages/modules/Connectivity/service/jni/
// com_android_server_connectivity_ClatCoordinator.cpp
if (chargeUid == AID_CLAT) {
return -EPERM;
}
uint64_t sock_cookie = getSocketCookie(sockFd); uint64_t sock_cookie = getSocketCookie(sockFd);
if (sock_cookie == NONEXISTENT_COOKIE) return -errno; if (sock_cookie == NONEXISTENT_COOKIE) return -errno;
UidTagValue newKey = {.uid = (uint32_t)chargeUid, .tag = tag}; UidTagValue newKey = {.uid = (uint32_t)chargeUid, .tag = tag};

7
netd/BpfHandlerTest.cpp
View File

@@ -16,6 +16,7 @@
* BpfHandlerTest.cpp - unit tests for BpfHandler.cpp * BpfHandlerTest.cpp - unit tests for BpfHandler.cpp
*/ */
#include <private/android_filesystem_config.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@@ -208,6 +209,12 @@ TEST_F(BpfHandlerTest, TestTagSocketWithPermission) {
EXPECT_EQ(0, mBh.untagSocket(v6socket)); EXPECT_EQ(0, mBh.untagSocket(v6socket));
expectNoTag(sockCookie); expectNoTag(sockCookie);
expectMapEmpty(mFakeCookieTagMap); expectMapEmpty(mFakeCookieTagMap);
// Tag a socket to AID_CLAT other then realUid.
int sock = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
ASSERT_NE(-1, sock);
ASSERT_EQ(-EPERM, mBh.tagSocket(sock, TEST_TAG, AID_CLAT, realUid));
expectMapEmpty(mFakeCookieTagMap);
} }
TEST_F(BpfHandlerTest, TestUntagInvalidSocket) { TEST_F(BpfHandlerTest, TestUntagInvalidSocket) {