From patchwork Thu Mar 9 10:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kacper_Piwi=C5=84ski?= X-Patchwork-Id: 66164 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DC96C3858028 for ; Thu, 9 Mar 2023 10:46:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC96C3858028 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678358767; bh=DGfRwQmBUNtU8pQjHwxNgq7koRixbO0lGh/Mh1KNPW0=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PveizeOicy9tVNi9XqGUqPRH2szSX2jwxLLRBlXhGQDFJ2qKTeNzy+iiCyku4piT1 VF1xGveNM0+nMKq8xTQHPZwjYsCHPv5QZhUH+AntqqtVnXAtcBnhlGoch1g/6Wwk6z LRXyuS2f7GqUo/RU3O73iHuGeX5t0qUTE+9cqWdo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by sourceware.org (Postfix) with ESMTPS id 1681E3858D33 for ; Thu, 9 Mar 2023 10:45:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1681E3858D33 Received: by mail-yb1-xb29.google.com with SMTP id 82so1399083ybn.6 for ; Thu, 09 Mar 2023 02:45:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678358745; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DGfRwQmBUNtU8pQjHwxNgq7koRixbO0lGh/Mh1KNPW0=; b=GkdQk8F/27MfUv+0dggLdcUTG8gYtgg1S6020GqYWBN5BLca6CIulPV8EZOswGWuAf Q5w3hnrBK8Zw1OJDOATAyX2r5XFA+Qq+/Hi55cIyKCEisAxgKlztrHx5nvdbPcdPbIIA XD/ol2ItCcsn3yrlTf4B8NYSkkHgs1hePEosDC3LqQPkhlbg4frdgXL4CwRrl3kSKEK6 SV4cQGz0HNS99cGONdVGWWTPrZov4FpvKdnf0cCgPRpFQDi2Qoj7Vg+eWSvVpN83N+t/ ZBr+zqnoexd8LsgoJMtbyA3ymKIlIYEKIyqFjL4vQlg9BWNZ0UvOeK5LEfmazjUDBhF1 GAMw== X-Gm-Message-State: AO0yUKU4U1UelvgExmtxKENj/xPj6CyQq4ATvMVlGxN3EV9flIIyFWUO P5nU9QynbBtr//A1D45v7TpkDB4x46FcNE3y7YmBENCB X-Google-Smtp-Source: AK7set874OMUIgr00i7KiL5Tzmy3OY89UUp78Aql8Uj5X+JNvya3XaW6Cl8OsD9sUuLRF7w+rwnow9WBsFMk9iXjUCA= X-Received: by 2002:a5b:b51:0:b0:a20:11a9:bd4a with SMTP id b17-20020a5b0b51000000b00a2011a9bd4amr10774668ybr.0.1678358745421; Thu, 09 Mar 2023 02:45:45 -0800 (PST) MIME-Version: 1.0 Date: Thu, 9 Mar 2023 11:45:34 +0100 Message-ID: Subject: [PATCH v3] linux: fix ntp_gettime abi break To: =?utf-8?q?Kacper_Piwi=C5=84ski_via_Libc-alpha?= , Florian Weimer , Adhemerval Zanella Netto X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Kacper_Piwi=C5=84ski_via_Libc-alpha?= From: =?utf-8?q?Kacper_Piwi=C5=84ski?= Reply-To: =?utf-8?q?Kacper_Piwi=C5=84ski?= Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reviewed-by: Adhemerval Zanella From c9130bbacfe66c1fe5f1ad7a40293523075b1c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Piwi=C5=84ski?= Date: Thu, 9 Mar 2023 11:38:59 +0100 Subject: [PATCH v3] linux: fix ntp_gettime abi break Between versions v2.11 and v2.12 struct ntptimeval got new fields. That wasn't a problem because new function ntp_gettimex was created (and made default) to support new struct. Old ntp_gettime was not using new fields so it was safe to call with old struct definition. Then commits 5613afe9e3dff and b6ad64b907a (added for 64 bit time_t support), ntp_gettime start setting new fields. Sets fields manually to maintain compatibility with v2.11 struct definition. 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