From: "Kacper Piwiński" <vfjpl1@gmail.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: "Kacper Piwiński via Libc-alpha" <libc-alpha@sourceware.org>
Subject: Re: [PATCH v2] linux: fix ntp_gettime abi break
Date: Thu, 9 Mar 2023 11:40:59 +0100 [thread overview]
Message-ID: <CAKVti-Cq9gW4xd1xA404gTHQEeXKinqsQgCg4U+b838sG-XqWA@mail.gmail.com> (raw)
In-Reply-To: <87bkl3seeg.fsf@oldenburg.str.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: v3-0001-linux-fix-ntp_gettime-abi-break.patch --]
[-- Type: text/x-patch, Size: 1653 bytes --]
From c9130bbacfe66c1fe5f1ad7a40293523075b1c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Piwi=C5=84ski?= <vfjpl1@gmail.com>
Date: Thu, 9 Mar 2023 11:38:59 +0100
Subject: [PATCH v3] linux: fix ntp_gettime abi break
introduced in:
commit 5613afe9e3dff54b10e4850804cd574e8c420e3d
commit b6ad64b907ab0066902215cf28eadc1e97307e84
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
prev parent reply other threads:[~2023-03-09 10:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 9:23 Kacper Piwiński
2023-03-08 10:53 ` Florian Weimer
2023-03-08 12:31 ` Adhemerval Zanella Netto
2023-03-09 10:40 ` Kacper Piwiński [this message]
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-Cq9gW4xd1xA404gTHQEeXKinqsQgCg4U+b838sG-XqWA@mail.gmail.com \
--to=vfjpl1@gmail.com \
--cc=fweimer@redhat.com \
--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).