From fbd4ccf33339a261812521fbc54554850a70676c Mon Sep 17 00:00:00 2001
From: Jamie Liu <jamieliu@google.com>
Date: Thu, 8 Jul 2021 12:23:43 -0700
Subject: Fix async-signal-unsafety in socket test.

PiperOrigin-RevId: 383689096
---
 test/syscalls/linux/socket.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'test/syscalls/linux/socket.cc')

diff --git a/test/syscalls/linux/socket.cc b/test/syscalls/linux/socket.cc
index 7b966484d..2742d19be 100644
--- a/test/syscalls/linux/socket.cc
+++ b/test/syscalls/linux/socket.cc
@@ -119,6 +119,9 @@ TEST(SocketTest, UnixSCMRightsOnlyPassedOnce) {
   // Send more than what will fit inside the send/receive buffers, so that it is
   // split into multiple messages.
   constexpr int kBufSize = 0x100000;
+  // Heap allocation is async-signal-unsafe and thus cannot occur between fork()
+  // and execve().
+  std::vector<char> buf(kBufSize);
 
   pid_t pid = fork();
   if (pid == 0) {
@@ -127,7 +130,6 @@ TEST(SocketTest, UnixSCMRightsOnlyPassedOnce) {
     // Construct a message with some control message.
     struct msghdr msg = {};
     char control[CMSG_SPACE(sizeof(int))] = {};
-    std::vector<char> buf(kBufSize);
     struct iovec iov = {};
     msg.msg_control = control;
     msg.msg_controllen = sizeof(control);
@@ -154,7 +156,6 @@ TEST(SocketTest, UnixSCMRightsOnlyPassedOnce) {
 
   struct msghdr msg = {};
   char control[CMSG_SPACE(sizeof(int))] = {};
-  std::vector<char> buf(kBufSize);
   struct iovec iov = {};
   msg.msg_control = &control;
   msg.msg_controllen = sizeof(control);
-- 
cgit v1.2.3