From: "Kacper Piwiński" <vfjpl1@gmail.com>
To: "Kacper Piwiński via Libc-alpha" <libc-alpha@sourceware.org>,
"Adhemerval Zanella Netto" <adhemerval.zanella@linaro.org>
Subject: [PATCH] linux: fix ntp_gettime abi break
Date: Wed, 8 Mar 2023 09:58:29 +0100 [thread overview]
Message-ID: <CAKVti-BC8tCfANjM7F6y-OADDRrt+NZJeiWR4_f=SkQcbLe1FA@mail.gmail.com> (raw)
From e7f73725d3a6de69fde1b24cdfb4e11df04db8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Piwi=C5=84ski?= <vfjpl1@gmail.com>
Date: Wed, 8 Mar 2023 09:55:38 +0100
Subject: [PATCH] linux: fix ntp_gettime abi break
Resolves #30156.
---
sysdeps/unix/sysv/linux/ntp_gettime.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/ntp_gettime.c
b/sysdeps/unix/sysv/linux/ntp_gettime.c
index 4879573530..af1ed920d3 100644
--- a/sysdeps/unix/sysv/linux/ntp_gettime.c
+++ b/sysdeps/unix/sysv/linux/ntp_gettime.c
@@ -26,6 +26,11 @@
# define modes mode
#endif
+/* glibc 2.12 added the 'tai' field to follow along the kernel, but it did
+ not add a compatibility symbol, instead it added __ntp_gettimex. However
+ ntptimeval was still used in both cases, so to keep compatibility it
+ can not set all the new field. */
+
/* clock_adjtime64 with CLOCK_REALTIME does not trigger EINVAL,
ENODEV, or EOPNOTSUPP. It might still trigger EPERM. */
@@ -40,7 +45,7 @@ __ntp_gettime64 (struct __ntptimeval64 *ntv)
ntv->time = tntx.time;
ntv->maxerror = tntx.maxerror;
ntv->esterror = tntx.esterror;
- ntv->tai = tntx.tai;
+
return result;
}
@@ -54,7 +59,9 @@ __ntp_gettime (struct ntptimeval *ntv)
int result;
result = __ntp_gettime64 (&ntv64);
- *ntv = valid_ntptimeval64_to_ntptimeval (ntv64);
+ ntv->time = valid_timeval64_to_timeval (ntv64.time);
+ ntv->maxerror = ntv64.maxerror;
+ ntv->esterror = ntv64.esterror;
return result;
}
--
2.34.1
next reply other threads:[~2023-03-08 8:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 8:58 Kacper Piwiński [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-21 4:04 Kacper Piwiński
2023-02-21 11:24 ` Andreas Schwab
2023-02-24 15:15 ` Kacper Piwiński
2023-03-02 17:47 ` Carlos O'Donell
2023-03-03 8:47 ` Kacper Piwiński
2023-03-03 13:03 ` Adhemerval Zanella Netto
2023-03-03 16:43 ` Kacper Piwiński
2023-03-07 14:11 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKVti-BC8tCfANjM7F6y-OADDRrt+NZJeiWR4_f=SkQcbLe1FA@mail.gmail.com' \
--to=vfjpl1@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).