From patchwork Tue Jun 30 14:06:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39835 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 604833861887; Tue, 30 Jun 2020 14:07:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 604833861887 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1593526024; bh=rAJMc0+yWNKFA+crINFi27helLjbLt0DuEzvbCdrJS4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Ayley4pB+dCRj0H0yb67FX7OJJNNLNskV5XFxyLRmhN5sSdtxnKoGxkpy5W8F4Ugz L3tASN7/RZ5jjf9PPTDir6wgXx0pXJmLh++OFFbovcJ/SjSKgbVDBghQ7TucJofPW4 SyF125mNKLz1HKtaoHW5OwV+Vl3h0NG/7wiufeMc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 3D7E23861887 for ; Tue, 30 Jun 2020 14:07:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3D7E23861887 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393--j_bf_aLO92-qNmsKcU-KQ-1; Tue, 30 Jun 2020 10:06:52 -0400 X-MC-Unique: -j_bf_aLO92-qNmsKcU-KQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9090780402B; Tue, 30 Jun 2020 14:06:27 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-128.ams2.redhat.com [10.36.112.128]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F28F7BEB7; Tue, 30 Jun 2020 14:06:26 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Linux: Fix UTC offset setting in settimeofday for __TIMESIZE != 64 Date: Tue, 30 Jun 2020 16:06:25 +0200 Message-ID: <87bll0ps0u.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The time argument is NULL in this case, and attempt to convert it leads to a null pointer dereference. This fixes commit d2e3b697da2433c08702f95c76458c51545c3df1 ("y2038: linux: Provide __settimeofday64 implementation"). --- Tested on i686-linux-gnu, but only with the glibc test suite. sysdeps/unix/sysv/linux/settimeofday.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sysdeps/unix/sysv/linux/settimeofday.c b/sysdeps/unix/sysv/linux/settimeofday.c index ea45f1d7cb..40529cdeec 100644 --- a/sysdeps/unix/sysv/linux/settimeofday.c +++ b/sysdeps/unix/sysv/linux/settimeofday.c @@ -25,14 +25,14 @@ int __settimeofday64 (const struct __timeval64 *tv, const struct timezone *tz) { + /* The 64-bit interface does support setting the UTC offset. */ if (__glibc_unlikely (tz != 0)) { if (tv != 0) - { - __set_errno (EINVAL); - return -1; - } - return __settimezone (tz); + __set_errno (EINVAL); + else + __set_errno (ENOSYS); + return -1; } struct __timespec64 ts = timeval64_to_timespec64 (*tv); @@ -45,8 +45,18 @@ libc_hidden_def (__settimeofday64) int __settimeofday (const struct timeval *tv, const struct timezone *tz) { + /* Backwards compatibility for setting the UTC offset. */ + if (__glibc_unlikely (tz != 0)) + { + if (tv != 0) + { + __set_errno (EINVAL); + return -1; + } + return __settimezone (tz); + } + struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); - return __settimeofday64 (&tv64, tz); } #endif