From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 8FA7A3858C54 for ; Wed, 8 Mar 2023 08:58:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8FA7A3858C54 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-yb1-xb34.google.com with SMTP id e194so13938911ybf.1 for ; Wed, 08 Mar 2023 00:58:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678265921; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=oAwUDowo0Ri+aJkAyelKRo+KHHswLpLbOjfy2GxRvl8=; b=K070eL6+6i4FOqwoLoyL8LVEqOa+xkitnNgn+CEPhqmFeDT3l73utb4bvVWcaLL6oO sqdE1WMyR6SAmfzJ5/Ghc+Oz+w/ytb2HMiYMwIft02WUp35rhRoOzJxCErHs1Gah3IQK RfSNlqYaBBEtn5EDp0hEDaFpuj4XtBapiVOs7O65cP9rc95AHh9P36rLmcqDP7FWeb8N 3tYtoJWklFAICdcG+PJOI/UzFgui4np3w3MqdopzkIWbCu8fMqEQW1c8j4cLiB5Jvucs PXI4wx5TosmMB1H5MUUl6XWrCeuvy5ugadwWGG8Jz0nbJjqRzIsFy2mWiWAkEq6HJplg nY6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678265921; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=oAwUDowo0Ri+aJkAyelKRo+KHHswLpLbOjfy2GxRvl8=; b=zZHlOcVcMl1oH9g2VtLYJPjYgVtTBeGaWIONIw7u/aYzTuG3KV6b3laPbl/mL/nZPl QTTNnK7DukqTqrS5N1F6X8VvurPkzFpYpUwKbAuS3/EkdqAEYMtJeaT1AFT0TTR5DgJW bzdf4z6DwrzA496e+oVm8/zsThMm/41YZ/Vy69fmLJorHxuaplupihaMXG1qbaIoFXKg /6KbHqs7gw7n6QqZdWnoQZoS4ndk4DpF7ItMyHRG1E93zCw2DhpoqVQx5VUvgZ3d1rPd z5hSXFRZEFtUIKPKQV/SNdkHeIH0Srgm0vIKcTrrgQ2IgI2dMbglA/8tO2H5s4eoevVo 9iFA== X-Gm-Message-State: AO0yUKWqGlZzkbbZBI5uAKepgmEtQ861fP2sC5BxEmuPIqfAPql4c1jR 2jR+X42F9csx045l+E+pyLJIh0cr8EPossrgeRKoOcF+kog= X-Google-Smtp-Source: AK7set9OLQBytUhpe3czkueEKSjA1SN2xqwhep1YvhuxYWX2qTqBa1jNG7pI8X97fD9uPNExgSf1JyoV6DQD8VjzCH0= X-Received: by 2002:a5b:a0c:0:b0:a24:1001:1fd2 with SMTP id k12-20020a5b0a0c000000b00a2410011fd2mr10493730ybq.0.1678265920867; Wed, 08 Mar 2023 00:58:40 -0800 (PST) MIME-Version: 1.0 From: =?UTF-8?Q?Kacper_Piwi=C5=84ski?= Date: Wed, 8 Mar 2023 09:58:29 +0100 Message-ID: Subject: [PATCH] linux: fix ntp_gettime abi break To: =?UTF-8?Q?Kacper_Piwi=C5=84ski_via_Libc=2Dalpha?= , Adhemerval Zanella Netto Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-6.6 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 List-Id: >From e7f73725d3a6de69fde1b24cdfb4e11df04db8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Piwi=C5=84ski?= 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