From 02c5019a35655560ad1e50dbcb0b02ecae9df3b0 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 16 Mar 2020 15:28:13 +0100 Subject: toolchain: glibc: Update glibc to version 2.31 This updates glibc to the most recent version 2.31. 001-regex-read-overrun.patch was a backport from a more recent version and is integrated in glibc 2.31. 050-Revert-Disallow-use-of-DES-encryption-functions-in-n.patch is needed to add the DES crypto functions back again. They were removed in glibc 2.28, but we still use them in ppp. musl lib also provides these DES crypto functions. Without them we would have to link ppp against openssl or an other crypto library. Signed-off-by: Hauke Mehrtens --- .../glibc/patches/001-regex-read-overrun.patch | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 toolchain/glibc/patches/001-regex-read-overrun.patch (limited to 'toolchain/glibc/patches/001-regex-read-overrun.patch') diff --git a/toolchain/glibc/patches/001-regex-read-overrun.patch b/toolchain/glibc/patches/001-regex-read-overrun.patch deleted file mode 100644 index c4e4307aa6..0000000000 --- a/toolchain/glibc/patches/001-regex-read-overrun.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 583dd860d5b833037175247230a328f0050dbfe9 -Author: Paul Eggert -Date: Mon Jan 21 11:08:13 2019 -0800 - - regex: fix read overrun [BZ #24114] - - Problem found by AddressSanitizer, reported by Hongxu Chen in: - https://debbugs.gnu.org/34140 - * posix/regexec.c (proceed_next_node): - Do not read past end of input buffer. - ---- a/posix/regexec.c -+++ b/posix/regexec.c -@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, - else if (naccepted) - { - char *buf = (char *) re_string_get_buffer (&mctx->input); -- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, -- naccepted) != 0) -+ if (mctx->input.valid_len - *pidx < naccepted -+ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, -+ naccepted) -+ != 0)) - return -1; - } - } -- cgit v1.2.3