4 files changed, 81 insertions, 0 deletions
diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD
index b66112f6e..8494862fa 100644
--- a/test/syscalls/BUILD
+++ b/test/syscalls/BUILD
@@ -367,6 +367,10 @@ syscall_test(
 )
 
 syscall_test(
+    test = "//test/syscalls/linux:packet_socket_test",
+)
+
+syscall_test(
     test = "//test/syscalls/linux:partial_bad_buffer_test",
 )
 
diff --git a/test/syscalls/linux/BUILD b/test/syscalls/linux/BUILD
index 1fcf78ddf..85fa58970 100644
--- a/test/syscalls/linux/BUILD
+++ b/test/syscalls/linux/BUILD
@@ -7,6 +7,7 @@ package(
 
 exports_files(
     [
+        "packet_socket.cc",
         "packet_socket_dgram.cc",
         "packet_socket_raw.cc",
         "raw_socket.cc",
@@ -1481,6 +1482,20 @@ cc_binary(
 )
 
 cc_binary(
+    name = "packet_socket_test",
+    testonly = 1,
+    srcs = ["packet_socket.cc"],
+    linkstatic = 1,
+    deps = [
+        "//test/util:capability_util",
+        "//test/util:file_descriptor",
+        "//test/util:socket_util",
+        gtest,
+        "//test/util:test_main",
+    ],
+)
+
+cc_binary(
     name = "pty_test",
     testonly = 1,
     srcs = ["pty.cc"],
diff --git a/test/syscalls/linux/packet_socket.cc b/test/syscalls/linux/packet_socket.cc
new file mode 100644
index 000000000..c8d1e1d4a
--- /dev/null
+++ b/test/syscalls/linux/packet_socket.cc
@@ -0,0 +1,60 @@
+// Copyright 2021 The gVisor Authors.
+//
+// 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 <net/if.h>
+#include <netinet/if_ether.h>
+
+#include <limits>
+
+#include "gtest/gtest.h"
+#include "test/util/capability_util.h"
+#include "test/util/file_descriptor.h"
+#include "test/util/socket_util.h"
+
+namespace gvisor {
+namespace testing {
+
+namespace {
+
+using ::testing::Combine;
+using ::testing::Values;
+
+class PacketSocketTest : public ::testing::TestWithParam<std::tuple<int, int>> {
+ protected:
+  void SetUp() override {
+    if (!ASSERT_NO_ERRNO_AND_VALUE(HavePacketSocketCapability())) {
+      const auto [type, protocol] = GetParam();
+      ASSERT_THAT(socket(AF_PACKET, type, htons(protocol)),
+                  SyscallFailsWithErrno(EPERM));
+      GTEST_SKIP() << "Missing packet socket capability";
+    }
+  }
+};
+
+TEST_P(PacketSocketTest, Create) {
+  const auto [type, protocol] = GetParam();
+  FileDescriptor fd =
+      ASSERT_NO_ERRNO_AND_VALUE(Socket(AF_PACKET, type, htons(protocol)));
+  EXPECT_GE(fd.get(), 0);
+}
+
+INSTANTIATE_TEST_SUITE_P(AllPacketSocketTests, PacketSocketTest,
+                         Combine(Values(SOCK_DGRAM, SOCK_RAW),
+                                 Values(0, 1, 255, ETH_P_IP, ETH_P_IPV6,
+                                        std::numeric_limits<uint16_t>::max())));
+
+}  // namespace
+
+}  // namespace testing
+}  // namespace gvisor
diff --git a/test/util/capability_util.h b/test/util/capability_util.h
index 318a43feb..ac1a1b32b 100644
--- a/test/util/capability_util.h
+++ b/test/util/capability_util.h
@@ -17,6 +17,8 @@
 #ifndef GVISOR_TEST_UTIL_CAPABILITY_UTIL_H_
 #define GVISOR_TEST_UTIL_CAPABILITY_UTIL_H_
 
+#include "test/util/posix_error.h"
+
 #if defined(__Fuchsia__)
 // Nothing to include.
 #elif defined(__linux__)