[glibc] 01/01: debian/patches/git-updates.diff: update from upstream stable branch:
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 815dc4a9097b3128c0d4d4cfb6814f92d9841d7d
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed Jan 10 22:41:25 2018 +0100
debian/patches/git-updates.diff: update from upstream stable branch:
* debian/patches/git-updates.diff: update from upstream stable branch:
- Fix memchr pointer overflow on ia64. Closes: #886840.
---
debian/changelog | 2 ++
debian/patches/git-updates.diff | 45 ++++++++++++++++++++++++++++++++++++-----
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7df43ba..74a9dd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ glibc (2.26-3) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
* debian/testsuite-xfail-debian.mk: the Loongson 3 FPU bug also applies
to mips64el.
+ * debian/patches/git-updates.diff: update from upstream stable branch:
+ - Fix memchr pointer overflow on ia64. Closes: #886840.
[ Samuel Thibault ]
* debian/patches/hurd-i386/submitted-malloc-setstate.diff: Disable for now, it
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index bd53b78..be70c25 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,22 @@
GIT update of https://sourceware.org/git/glibc.git/release/2.26/master from glibc-2.26
diff --git a/ChangeLog b/ChangeLog
-index 8dbfc7eaff..2e6383b3dc 100644
+index 8dbfc7eaff..efc8395ebb 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,1123 @@
+@@ -1,3 +1,1136 @@
++2017-12-19 Adhemerval Zanella <adhemerval.zanella@linaro.org>
++ James Clarke <jrtc27@jrtc27.com>
++
++ [BZ #22603]
++ * sysdeps/ia64/memchr.S (__memchr): Avoid overflow in pointer
++ addition.
++
++2018-01-08 Dmitry V. Levin <ldv@altlinux.org>
++
++ * sysdeps/unix/sysv/linux/tst-ttyname.c (do_in_chroot_1): Skip the
++ test instead of failing in case of ENOENT returned by posix_openpt.
++
+2017-12-29 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #22611]
@@ -15,6 +27,7 @@ index 8dbfc7eaff..2e6383b3dc 100644
+ Dmitry V. Levin <ldv@altlinux.org>
+
+ [BZ #22625]
++ CVE-2017-16997
+ * elf/dl-load.c (fillin_rpath): Check for empty tokens before dynamic
+ string token expansion. Check for NULL pointer or empty string possibly
+ returned by expand_dynamic_string_token.
@@ -15901,6 +15914,21 @@ index 2776ba7fae..543cebcb63 100644
+ldouble: 3
# end of automatic generation
+diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S
+index d60cf7bd87..9a0abc6f0a 100644
+--- a/sysdeps/ia64/memchr.S
++++ b/sysdeps/ia64/memchr.S
+@@ -67,6 +67,10 @@ ENTRY(__memchr)
+ .body
+ mov ret0 = str
+ add last = str, in2 // last byte
++ ;;
++ cmp.ltu p6, p0 = last, str
++ ;;
++(p6) mov last = -1
+ and tmp = 7, str // tmp = str % 8
+ cmp.ne p7, p0 = r0, r0 // clear p7
+ extr.u chr = in1, 0, 8 // chr = (unsigned char) in1
diff --git a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
index 631cb33d09..2a3bc75b20 100644
--- a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
@@ -22481,10 +22509,10 @@ index 0000000000..dfdf3da484
+#include <support/test-driver.c>
diff --git a/sysdeps/unix/sysv/linux/tst-ttyname.c b/sysdeps/unix/sysv/linux/tst-ttyname.c
new file mode 100644
-index 0000000000..0fdf1a8ccb
+index 0000000000..6848a6d3e2
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-ttyname.c
-@@ -0,0 +1,570 @@
+@@ -0,0 +1,577 @@
+/* Copyright (C) 2017 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -22740,7 +22768,14 @@ index 0000000000..0fdf1a8ccb
+ /* Open the PTS that we'll be testing on. */
+ int master;
+ char *slavename;
-+ VERIFY ((master = posix_openpt (O_RDWR|O_NOCTTY|O_NONBLOCK)) >= 0);
++ master = posix_openpt (O_RDWR|O_NOCTTY|O_NONBLOCK);
++ if (master < 0)
++ {
++ if (errno == ENOENT)
++ FAIL_UNSUPPORTED ("posix_openpt: %m");
++ else
++ FAIL_EXIT1 ("posix_openpt: %m");
++ }
+ VERIFY ((slavename = ptsname (master)));
+ VERIFY (unlockpt (master) == 0);
+ if (strncmp (slavename, "/dev/pts/", 9) != 0)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: