From patchwork Wed Mar 8 09:23:43 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: 66116 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 11DA83857400 for ; Wed, 8 Mar 2023 09:24:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11DA83857400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678267456; bh=+Z57VVgb4c+EHYs0/sfEnaEZvc93oyei1XJLj0rdXOs=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=u7iag0zGPdfpOW8xGs+5Ej6EjB9o8dxmNzbIGwOA3nfOgApAtOW5eNJlJiT7ORZQ1 r7EvWYpKv/w4vx2DFViZBIwUWLQ9DF9ZsohG+FmNALt5YwZjtGt+rwLsb4lWiQv64m 7hgg/2LQ54QOg89hzYpSZCgAVocbrCHBYTiiUGw0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) by sourceware.org (Postfix) with ESMTPS id CBC953858C54 for ; Wed, 8 Mar 2023 09:23:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CBC953858C54 Received: by mail-yb1-xb34.google.com with SMTP id k23so13931774ybk.13 for ; Wed, 08 Mar 2023 01:23:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678267434; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+Z57VVgb4c+EHYs0/sfEnaEZvc93oyei1XJLj0rdXOs=; b=hDIIcEZnk/BgpBZTYZLuYS73zHKZA2aw7zgocKpqVLSOsCrjz86QqqicRPwMUoN4b5 WS4GPZ3Y2PXL4TiOYHItS7l7itwlVEJPMYdKuneUze/kZJXeN1drDTB/MspjkYOS9Urz 4lLhB3949eKef4sg8n07J+4HTb51673erZr8HSw+EQgwEdipaT20mwIBh2ycNmdcvQ2r 6hq7jrQDzIBk3R8gh1q/yTO8+YpLgWzdLBjrXCStxwPLCj8B3Ar35Sw5TCcVJ/dD6SXr 53pDrh6EWVDOSWRhSiTXCfPuUVZf1yakZsIhQ+dBIzCJodsnb5VnFsPieA8y/9h3wo0d mZqQ== X-Gm-Message-State: AO0yUKX99I2Hx61m67RepVEOD6FoCCkQgNKheMSY4s3YZgnp09n4Aouk ecLpa3LKEarLSy/FJonE8o0PmAN2u3Z+QH/sUfG6wOVh X-Google-Smtp-Source: AK7set8qGK6PLJAxs/f8EPV3CqHJ+ucK5b7FMCvJJvXActuFl+C+fu6Uhp2TLCS/uI+0ZIT+VzD+niQwT1TqGcO42tw= X-Received: by 2002:a5b:38d:0:b0:8ea:3d09:b125 with SMTP id k13-20020a5b038d000000b008ea3d09b125mr8472006ybp.0.1678267434238; Wed, 08 Mar 2023 01:23:54 -0800 (PST) MIME-Version: 1.0 Date: Wed, 8 Mar 2023 10:23:43 +0100 Message-ID: Subject: [PATCH v2] linux: fix ntp_gettime abi break To: =?utf-8?q?Kacper_Piwi=C5=84ski_via_Libc-alpha?= X-Spam-Status: No, score=-6.8 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" From 57cfc759e3982ad591cf4d8c5f3392daf3799b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Piwi=C5=84ski?= Date: Wed, 8 Mar 2023 10:14:16 +0100 Subject: [PATCH v2] 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 sysdeps/unix/sysv/linux/ntp_gettime.c sysdeps/unix/sysv/linux/ntp_gettime.c index 4879573530..af1ed920d3 100644 --- sysdeps/unix/sysv/linux/ntp_gettime.c +++ 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