mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

glibc: Make adjtime() for 32 bit support being called with delta == NULL

Browse Source 
This backports a fix from glibc's master branch, which solves a
regression in 2.32 with adjtime() where it would seg fault if being
called with delta == NULL on 32 bit machines.

(From OE-Core rev: aeecccf17c45c840c070e2de95c602a3c7e9d30e)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
2020-12-17 02:09:10 +01:00
committed by Richard Purdie
parent 87b38ee1c1
commit 8c4e5c0466
2 changed files with 111 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
meta/recipes-core/glibc/glibc/0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch Normal file
View File

@@ -0,0 +1,110 @@
From 75a193b7611bade31a150dfcc528b973e3d46231 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon, 2 Nov 2020 16:18:29 -0300
Subject: [PATCH] linux: Allow adjtime with NULL argument [BZ #26833]
The adjtime interface allows return the amount of time remaining
from any previous adjustment that has not yet been completed by
passing a NULL as first argument. This was introduced with y2038
support 0308077e3a.
Checked on i686-linux-gnu.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=75a193b7611bade31a150dfcc528b973e3d46231]
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
sysdeps/unix/sysv/linux/adjtime.c | 11 +++++---
time/Makefile | 3 ++-
time/tst-adjtime.c | 44 +++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 4 deletions(-)
create mode 100644 time/tst-adjtime.c
diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c
index 3f9a4ea2eb..6d1d1b6af2 100644
--- a/sysdeps/unix/sysv/linux/adjtime.c
+++ b/sysdeps/unix/sysv/linux/adjtime.c
@@ -68,11 +68,16 @@ libc_hidden_def (__adjtime64)
int
__adjtime (const struct timeval *itv, struct timeval *otv)
{
- struct __timeval64 itv64, otv64;
+ struct __timeval64 itv64, *pitv64 = NULL;
+ struct __timeval64 otv64;
int retval;
- itv64 = valid_timeval_to_timeval64 (*itv);
- retval = __adjtime64 (&itv64, otv != NULL ? &otv64 : NULL);
+ if (itv != NULL)
+ {
+ itv64 = valid_timeval_to_timeval64 (*itv);
+ pitv64 = &itv64;
+ }
+ retval = __adjtime64 (pitv64, otv != NULL ? &otv64 : NULL);
if (otv != NULL)
*otv = valid_timeval64_to_timeval (otv64);
diff --git a/time/Makefile b/time/Makefile
index 26aa835166..f27a75a115 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -47,7 +47,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \
- tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1
+ tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \
+ tst-adjtime
include ../Rules
diff --git a/time/tst-adjtime.c b/time/tst-adjtime.c
new file mode 100644
index 0000000000..ae2b37cdab
--- /dev/null
+++ b/time/tst-adjtime.c
@@ -0,0 +1,44 @@
+/* Basic tests for adjtime.
+ Copyright (C) 2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <sys/time.h>
+#include <stdlib.h>
+
+#include <errno.h>
+#include <support/check.h>
+
+
+static int
+do_test (void)
+{
+ /* Check if the interface allows getting the amount of time remaining
+ from any previous adjustment that has not yet been completed. This
+ is a non-privileged function of adjtime. */
+ struct timeval tv;
+ int r = adjtime (NULL, &tv);
+ if (r == -1)
+ {
+ if (errno == ENOSYS)
+ FAIL_UNSUPPORTED ("adjtime unsupported");
+ FAIL_EXIT1 ("adjtime (NULL, ...) failed: %m");
+ }
+
+ return 0;
+}
+
+#include <support/test-driver.c>

1
meta/recipes-core/glibc/glibc_2.32.bb
View File

@@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \
file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \
file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \
file://0031-linux-Allow-adjtime-with-NULL-argument-BZ-26833.patch \
file://CVE-2020-29562.patch \
file://CVE-2020-29573.patch \
"