commit 3f2dab48fc97bd4b5f573683442fcf8811900c2f
author Maciej Żenczykowski <maze@google.com> Thu Jul 21 08:58:23 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Thu Jul 21 13:36:06 2022 +0000
tree 1c9db5712236d2f369ca6b0a74bdc43f6e43a656
parent a530228ecdc7e8c101656bb4b2b06d4b84ac6582

support bpf_map_def struct size increase to fix map uid != AID_ROOT

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

tests/cts/net/native/src/BpfCompatTest.cpp

diff --git a/tests/cts/net/native/src/BpfCompatTest.cpp b/tests/cts/net/native/src/BpfCompatTest.cpp
index e52533b..9f80e2b 100644
--- a/tests/cts/net/native/src/BpfCompatTest.cpp
+++ b/tests/cts/net/native/src/BpfCompatTest.cpp
@@ -31,7 +31,10 @@
   std::ifstream elfFile(elfPath, std::ios::in | std::ios::binary);
   ASSERT_TRUE(elfFile.is_open());
 
-  if (android::modules::sdklevel::IsAtLeastT()) {
+  if (android::modules::sdklevel::IsAtLeastU()) {
+    EXPECT_EQ(120, readSectionUint("size_of_bpf_map_def", elfFile, 0));
+    EXPECT_EQ(92, readSectionUint("size_of_bpf_prog_def", elfFile, 0));
+  } else if (android::modules::sdklevel::IsAtLeastT()) {
     EXPECT_EQ(116, readSectionUint("size_of_bpf_map_def", elfFile, 0));
     EXPECT_EQ(92, readSectionUint("size_of_bpf_prog_def", elfFile, 0));
   } else {