Message ID | 87lfk4mlz6.fsf@oldenburg2.str.redhat.com |
---|---|
State | Committed |
Headers |
Return-Path: <libc-alpha-bounces@sourceware.org> 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 68B53385703B; Tue, 30 Jun 2020 18:45:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 68B53385703B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1593542726; bh=EcQhjcnk5aGAhXZ1oHg3H71GE/+4JbEXO3Mi5gu9ipY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=oqRLXC7C3utwgFRehtzHlWdWwmBpj/K4WDMcCwjTUv6smtCaOk2P+Vhqg39Tan962 W5V6wgxN+6PXxTVlHXxpepHBojfnUyhU6u2V+kx3uOQLrqh8YVl1KTN3kakWuR8Yfu zW0e5PyW21UCADqer0O9D1aoKjPJXsX/QlGuYrtg= 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 [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id E5EAF385ED4A for <libc-alpha@sourceware.org>; Tue, 30 Jun 2020 18:45:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E5EAF385ED4A 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-4-oyTMbudpMlOS_tI3Dso5sw-1; Tue, 30 Jun 2020 14:45:21 -0400 X-MC-Unique: oyTMbudpMlOS_tI3Dso5sw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B56A6804001; Tue, 30 Jun 2020 18:45:20 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-44.phx2.redhat.com [10.3.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95CF81A90F; Tue, 30 Jun 2020 18:45:19 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v2] Linux: Fix UTC offset setting in settimeofday for __TIMESIZE != 64 Date: Tue, 30 Jun 2020 20:45:17 +0200 Message-ID: <87lfk4mlz6.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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain 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 <libc-alpha.sourceware.org> List-Unsubscribe: <http://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <http://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Florian Weimer <fweimer@redhat.com> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org> |
Series |
[v2] Linux: Fix UTC offset setting in settimeofday for __TIMESIZE != 64
|
|
Commit Message
Florian Weimer
June 30, 2020, 6:45 p.m. UTC
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"). --- v2: Add just a null pointer check. Tested on x86_64-linux-gnu and i686-linux-gnu. sysdeps/unix/sysv/linux/settimeofday.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Comments
On 30/06/2020 15:45, Florian Weimer wrote: > 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"). LGTM, thanks. Reviwed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > > --- > v2: Add just a null pointer check. Tested on x86_64-linux-gnu and > i686-linux-gnu. > > sysdeps/unix/sysv/linux/settimeofday.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/settimeofday.c b/sysdeps/unix/sysv/linux/settimeofday.c > index ea45f1d7cb..6f4bc7ef3c 100644 > --- a/sysdeps/unix/sysv/linux/settimeofday.c > +++ b/sysdeps/unix/sysv/linux/settimeofday.c > @@ -25,6 +25,7 @@ > int > __settimeofday64 (const struct __timeval64 *tv, const struct timezone *tz) > { > + /* Backwards compatibility for setting the UTC offset. */ > if (__glibc_unlikely (tz != 0)) > { > if (tv != 0) > @@ -45,9 +46,13 @@ libc_hidden_def (__settimeofday64) > int > __settimeofday (const struct timeval *tv, const struct timezone *tz) > { > - struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); > - > - return __settimeofday64 (&tv64, tz); > + if (__glibc_unlikely (tv == NULL)) > + return __settimeofday64 (NULL, tz); Indentation seems off here. > + else > + { > + struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); > + return __settimeofday64 (&tv64, tz); > + } > } > #endif > weak_alias (__settimeofday, settimeofday); >
* Adhemerval Zanella: > On 30/06/2020 15:45, Florian Weimer wrote: >> 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"). > > LGTM, thanks. > > Reviwed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > >> >> --- >> v2: Add just a null pointer check. Tested on x86_64-linux-gnu and >> i686-linux-gnu. >> >> sysdeps/unix/sysv/linux/settimeofday.c | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/sysdeps/unix/sysv/linux/settimeofday.c b/sysdeps/unix/sysv/linux/settimeofday.c >> index ea45f1d7cb..6f4bc7ef3c 100644 >> --- a/sysdeps/unix/sysv/linux/settimeofday.c >> +++ b/sysdeps/unix/sysv/linux/settimeofday.c >> @@ -25,6 +25,7 @@ >> int >> __settimeofday64 (const struct __timeval64 *tv, const struct timezone *tz) >> { >> + /* Backwards compatibility for setting the UTC offset. */ >> if (__glibc_unlikely (tz != 0)) >> { >> if (tv != 0) >> @@ -45,9 +46,13 @@ libc_hidden_def (__settimeofday64) >> int >> __settimeofday (const struct timeval *tv, const struct timezone *tz) >> { >> - struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); >> - >> - return __settimeofday64 (&tv64, tz); >> + if (__glibc_unlikely (tv == NULL)) >> + return __settimeofday64 (NULL, tz); > > Indentation seems off here. Thanks. I'm going to fix this before committing. Thanks, Florian
On Tue, Jun 30, 2020 at 11:45 AM Florian Weimer via Libc-alpha <libc-alpha@sourceware.org> wrote: > > 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"). > > --- > v2: Add just a null pointer check. Tested on x86_64-linux-gnu and > i686-linux-gnu. > > sysdeps/unix/sysv/linux/settimeofday.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/settimeofday.c b/sysdeps/unix/sysv/linux/settimeofday.c > index ea45f1d7cb..6f4bc7ef3c 100644 > --- a/sysdeps/unix/sysv/linux/settimeofday.c > +++ b/sysdeps/unix/sysv/linux/settimeofday.c > @@ -25,6 +25,7 @@ > int > __settimeofday64 (const struct __timeval64 *tv, const struct timezone *tz) > { > + /* Backwards compatibility for setting the UTC offset. */ > if (__glibc_unlikely (tz != 0)) > { > if (tv != 0) > @@ -45,9 +46,13 @@ libc_hidden_def (__settimeofday64) > int > __settimeofday (const struct timeval *tv, const struct timezone *tz) > { > - struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); > - > - return __settimeofday64 (&tv64, tz); > + if (__glibc_unlikely (tv == NULL)) > + return __settimeofday64 (NULL, tz); > + else > + { > + struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); > + return __settimeofday64 (&tv64, tz); > + } Looks good Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > } > #endif > weak_alias (__settimeofday, settimeofday); >
On Tue, 30 Jun 2020 20:45:17 +0200 Florian Weimer <fweimer@redhat.com> wrote: > 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"). > > --- > v2: Add just a null pointer check. Tested on x86_64-linux-gnu and > i686-linux-gnu. > > sysdeps/unix/sysv/linux/settimeofday.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/settimeofday.c > b/sysdeps/unix/sysv/linux/settimeofday.c index ea45f1d7cb..6f4bc7ef3c > 100644 --- a/sysdeps/unix/sysv/linux/settimeofday.c > +++ b/sysdeps/unix/sysv/linux/settimeofday.c > @@ -25,6 +25,7 @@ > int > __settimeofday64 (const struct __timeval64 *tv, const struct > timezone *tz) { > + /* Backwards compatibility for setting the UTC offset. */ > if (__glibc_unlikely (tz != 0)) > { > if (tv != 0) > @@ -45,9 +46,13 @@ libc_hidden_def (__settimeofday64) > int > __settimeofday (const struct timeval *tv, const struct timezone *tz) > { > - struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); > - > - return __settimeofday64 (&tv64, tz); > + if (__glibc_unlikely (tv == NULL)) > + return __settimeofday64 (NULL, tz); > + else > + { > + struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); > + return __settimeofday64 (&tv64, tz); > + } > } > #endif > weak_alias (__settimeofday, settimeofday); > Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
diff --git a/sysdeps/unix/sysv/linux/settimeofday.c b/sysdeps/unix/sysv/linux/settimeofday.c index ea45f1d7cb..6f4bc7ef3c 100644 --- a/sysdeps/unix/sysv/linux/settimeofday.c +++ b/sysdeps/unix/sysv/linux/settimeofday.c @@ -25,6 +25,7 @@ int __settimeofday64 (const struct __timeval64 *tv, const struct timezone *tz) { + /* Backwards compatibility for setting the UTC offset. */ if (__glibc_unlikely (tz != 0)) { if (tv != 0) @@ -45,9 +46,13 @@ libc_hidden_def (__settimeofday64) int __settimeofday (const struct timeval *tv, const struct timezone *tz) { - struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); - - return __settimeofday64 (&tv64, tz); + if (__glibc_unlikely (tv == NULL)) + return __settimeofday64 (NULL, tz); + else + { + struct __timeval64 tv64 = valid_timeval_to_timeval64 (*tv); + return __settimeofday64 (&tv64, tz); + } } #endif weak_alias (__settimeofday, settimeofday);