From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 22F0E3877023; Tue, 6 Jul 2021 14:45:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22F0E3877023 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] linux: Use the expected size for SO_TIMESTAMP{NS} convertion X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 4b93a93e407308000ee6a1c3fec3715127c2c4c5 X-Git-Newrev: f7de21498dc6c517969315dcb3a675072c2cc87f Message-Id: <20210706144551.22F0E3877023@sourceware.org> Date: Tue, 6 Jul 2021 14:45:51 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2021 14:45:51 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f7de21498dc6c517969315dcb3a675072c2cc87f commit f7de21498dc6c517969315dcb3a675072c2cc87f Author: Adhemerval Zanella Date: Sat Jul 3 16:26:11 2021 -0300 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: --- sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c index 5af71847f5..00c934c413 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; }