signalfd: Populate ssi_int and ssi_ptr

PiperOrigin-RevId: 896674700

Author: shailend-g

pkg/sentry/fsimpl/signalfd/signalfd.go

@@ -112,6 +112,8 @@ func (sfd *SignalFileDescription) Read(ctx context.Context, dst usermem.IOSequen
 		Status:  info.Status(),
 		Overrun: uint32(info.Overrun()),
 		Addr:    info.Addr(),
+		Int:     int32(info.Sigval()),
+		Ptr:     info.Sigval(),
 	}
 	n, err := infoNative.WriteTo(dst.Writer(ctx))
 	if err == usermem.ErrEndOfIOSequence {

test/syscalls/linux/BUILD

@@ -2604,7 +2604,9 @@ cc_binary(
         "//test/util:test_main",
         "//test/util:test_util",
         "//test/util:thread_util",
+        "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/time",
     ],
 )
 

test/syscalls/linux/signalfd.cc

@@ -16,16 +16,22 @@
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/signalfd.h>
+#include <sys/syscall.h>
 #include <unistd.h>
 
+#include <ctime>
 #include <functional>
-#include <vector>
+#include <string>
 
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/strings/str_cat.h"
 #include "absl/synchronization/mutex.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "test/util/file_descriptor.h"
+#include "test/util/logging.h"
 #include "test/util/posix_error.h"
 #include "test/util/signal_util.h"
 #include "test/util/test_util.h"
@@ -341,6 +347,34 @@ TEST(Signalfd, KillStillKills) {
   EXPECT_EXIT(tgkill(getpid(), gettid(), SIGKILL), KilledBySignal(SIGKILL), "");
 }
 
+TEST(Signalfd, RtQueueDeliversPayload) {
+  const int signo = kSignoMax;
+  sigset_t mask;
+  sigemptyset(&mask);
+  sigaddset(&mask, signo);
+
+  const auto scoped_sigmask =
+      ASSERT_NO_ERRNO_AND_VALUE(ScopedSignalMask(SIG_BLOCK, signo));
+  FileDescriptor fd =
+      ASSERT_NO_ERRNO_AND_VALUE(NewSignalFD(&mask, SFD_NONBLOCK));
+
+  sigval_t first, second;
+  first.sival_int = 101;
+  second.sival_int = 102;
+  ASSERT_THAT(sigqueue(getpid(), signo, first), SyscallSucceeds());
+  ASSERT_THAT(sigqueue(getpid(), signo, second), SyscallSucceeds());
+
+  struct signalfd_siginfo ssi;
+  ASSERT_THAT(read(fd.get(), &ssi, sizeof(ssi)),
+              SyscallSucceedsWithValue(sizeof(ssi)));
+  EXPECT_EQ(ssi.ssi_signo, signo);
+  EXPECT_EQ(ssi.ssi_int, first.sival_int);
+  ASSERT_THAT(read(fd.get(), &ssi, sizeof(ssi)),
+              SyscallSucceedsWithValue(sizeof(ssi)));
+  EXPECT_EQ(ssi.ssi_signo, signo);
+  EXPECT_EQ(ssi.ssi_int, second.sival_int);
+}
+
 }  // namespace
 
 }  // namespace testing