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

remove obsolete/no-op NativeQtaguidTest am: 2aabf4138e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1757412

Change-Id: I43c6fa74b4fbd45cd047b6169316e656debae855
This commit is contained in:
Maciej Żenczykowski
2021-07-07 02:07:54 +00:00
committed by Automerger Merge Worker
parent b2817e8e31 2aabf4138e
commit 4f8727b8a7
4 changed files with 5 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/net/native/Android.bp
View File

@@ -33,19 +33,16 @@ cc_test {
srcs: [
"src/BpfCompatTest.cpp",
"src/NativeQtaguidTest.cpp",
],
shared_libs: [
"libbase",
"liblog",
"libutils",
],
static_libs: [
"libbpf_android",
"libgtest",
"libqtaguid",
],
// Tag this module as a cts test artifact

2
tests/cts/net/native/AndroidTest.xml
View File

@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration description="Config for CTS Native Network xt_qtaguid test cases">
<configuration description="Config for CTS Native Network test cases">
<option name="test-suite-tag" value="cts" />
<option name="config-descriptor:metadata" key="component" value="networking" />
<option name="config-descriptor:metadata" key="parameter" value="instant_app" />

7
tests/cts/net/native/src/BpfCompatTest.cpp
View File

@@ -25,8 +25,6 @@
using namespace android::bpf;
namespace android {
void doBpfStructSizeTest(const char *elfPath) {
std::ifstream elfFile(elfPath, std::ios::in | std::ios::binary);
ASSERT_TRUE(elfFile.is_open());
@@ -40,4 +38,7 @@ TEST(BpfTest, bpfStructSizeTest) {
doBpfStructSizeTest("/system/etc/bpf/clatd.o");
}
} // namespace android
int main(int argc, char **argv) {
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}

130
tests/cts/net/native/src/NativeQtaguidTest.cpp
View File

@@ -1,130 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <arpa/inet.h>
#include <error.h>
#include <errno.h>
#include <inttypes.h>
#include <fcntl.h>
#include <string.h>
#include <sys/socket.h>
#include <gtest/gtest.h>
#include <qtaguid/qtaguid.h>
int canAccessQtaguidFile() {
int fd = open("/proc/net/xt_qtaguid/ctrl", O_RDONLY | O_CLOEXEC);
close(fd);
return fd != -1;
}
#define SKIP_IF_QTAGUID_NOT_SUPPORTED() \
do { \
int res = canAccessQtaguidFile(); \
ASSERT_LE(0, res); \
if (!res) { \
GTEST_LOG_(INFO) << "This test is skipped since kernel may not have the module\n"; \
return; \
} \
} while (0)
int getCtrlSkInfo(int tag, uid_t uid, uint64_t* sk_addr, int* ref_cnt) {
FILE *fp;
fp = fopen("/proc/net/xt_qtaguid/ctrl", "r");
if (!fp)
return -ENOENT;
uint64_t full_tag = (uint64_t)tag << 32 | uid;
char pattern[40];
snprintf(pattern, sizeof(pattern), " tag=0x%" PRIx64 " (uid=%" PRIu32 ")", full_tag, uid);
size_t len;
char *line_buffer = NULL;
while(getline(&line_buffer, &len, fp) != -1) {
if (strstr(line_buffer, pattern) == NULL)
continue;
int res;
pid_t dummy_pid;
uint64_t k_tag;
uint32_t k_uid;
const int TOTAL_PARAM = 5;
res = sscanf(line_buffer, "sock=%" PRIx64 " tag=0x%" PRIx64 " (uid=%" PRIu32 ") "
"pid=%u f_count=%u", sk_addr, &k_tag, &k_uid,
&dummy_pid, ref_cnt);
if (!(res == TOTAL_PARAM && k_tag == full_tag && k_uid == uid))
return -EINVAL;
free(line_buffer);
return 0;
}
free(line_buffer);
return -ENOENT;
}
void checkNoSocketPointerLeaks(int family) {
int sockfd = socket(family, SOCK_STREAM, 0);
uid_t uid = getuid();
int tag = arc4random();
int ref_cnt;
uint64_t sk_addr;
uint64_t expect_addr = 0;
EXPECT_EQ(0, legacy_tagSocket(sockfd, tag, uid));
EXPECT_EQ(0, getCtrlSkInfo(tag, uid, &sk_addr, &ref_cnt));
EXPECT_EQ(expect_addr, sk_addr);
close(sockfd);
EXPECT_EQ(-ENOENT, getCtrlSkInfo(tag, uid, &sk_addr, &ref_cnt));
}
TEST (NativeQtaguidTest, close_socket_without_untag) {
SKIP_IF_QTAGUID_NOT_SUPPORTED();
int sockfd = socket(AF_INET, SOCK_STREAM, 0);
uid_t uid = getuid();
int tag = arc4random();
int ref_cnt;
uint64_t dummy_sk;
EXPECT_EQ(0, legacy_tagSocket(sockfd, tag, uid));
EXPECT_EQ(0, getCtrlSkInfo(tag, uid, &dummy_sk, &ref_cnt));
EXPECT_EQ(2, ref_cnt);
close(sockfd);
EXPECT_EQ(-ENOENT, getCtrlSkInfo(tag, uid, &dummy_sk, &ref_cnt));
}
TEST (NativeQtaguidTest, close_socket_without_untag_ipv6) {
SKIP_IF_QTAGUID_NOT_SUPPORTED();
int sockfd = socket(AF_INET6, SOCK_STREAM, 0);
uid_t uid = getuid();
int tag = arc4random();
int ref_cnt;
uint64_t dummy_sk;
EXPECT_EQ(0, legacy_tagSocket(sockfd, tag, uid));
EXPECT_EQ(0, getCtrlSkInfo(tag, uid, &dummy_sk, &ref_cnt));
EXPECT_EQ(2, ref_cnt);
close(sockfd);
EXPECT_EQ(-ENOENT, getCtrlSkInfo(tag, uid, &dummy_sk, &ref_cnt));
}
TEST (NativeQtaguidTest, no_socket_addr_leak) {
SKIP_IF_QTAGUID_NOT_SUPPORTED();
checkNoSocketPointerLeaks(AF_INET);
checkNoSocketPointerLeaks(AF_INET6);
}
int main(int argc, char **argv) {
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}