From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Sat, 3 Jul 2021 19:26:11 +0000 (-0300)
Subject: linux: Use the expected size for SO_TIMESTAMP{NS} convertion
X-Git-Tag: glibc-2.34~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7de21498dc6c517969315dcb3a675072c2cc87f;p=thirdparty%2Fglibc.git

linux: Use the expected size for SO_TIMESTAMP{NS} convertion

Kernel returns 32-bit values for COMPAT_SO_TIMESTAMP{NS}_OLD,
not 64-bit values.

Checked on x86_64-linux-gnu and i686-linux-gnu.
---

diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
index 5af71847f57..00c934c4135 100644
--- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
+++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
@@ -44,7 +44,8 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize)
      'struct __kernel_sock_timeval' while for SO_TIMESTAMPNS_NEW is a
      'struct __kernel_timespec'.  In either case it is two uint64_t
      members.  */
-  uint64_t tvts[2];
+  int64_t tvts[2];
+  int32_t tmp[2];
 
   struct cmsghdr *cmsg, *last = NULL;
   int type = 0;
@@ -69,7 +70,9 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize)
 
 	/* fallthrough  */
 	common:
-	  memcpy (tvts, CMSG_DATA (cmsg), sizeof (tvts));
+	  memcpy (tmp, CMSG_DATA (cmsg), sizeof (tmp));
+	  tvts[0] = tmp[0];
+	  tvts[1] = tmp[1];
 	  break;
 	}