diff --git a/pkgs/development/libraries/glibc/2.25-49to123.diff.gz b/pkgs/development/libraries/glibc/2.25-49to123.diff.gz new file mode 100644 index 000000000000..892ac757e26d Binary files /dev/null and b/pkgs/development/libraries/glibc/2.25-49to123.diff.gz differ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 6d2e884bd2da..2795aa36e184 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -19,7 +19,7 @@ let inherit (buildPackages) linuxHeaders; version = "2.25"; - patchSuffix = "-49"; + patchSuffix = "-123"; sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -46,7 +46,8 @@ stdenv.mkDerivation ({ $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz */ ./2.25-49.patch.gz - ./cve-2017-15670.patch + # contains fixes for CVE-2017-15670 and CVE-2018-1000001 + ./2.25-49to123.diff.gz ./cve-2009-5064.patch /* Have rpcgen(1) look for cpp(1) in $PATH. */ diff --git a/pkgs/development/libraries/glibc/cve-2017-15670.patch b/pkgs/development/libraries/glibc/cve-2017-15670.patch deleted file mode 100644 index 0cd99fe0cf56..000000000000 --- a/pkgs/development/libraries/glibc/cve-2017-15670.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://sourceware.org/bugzilla/show_bug.cgi?id=22320 -https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c369d66e5426a30e472 -diff --git a/posix/glob.c b/posix/glob.c -index 076ab2bd72..15a6c0cf13 100644 ---- a/posix/glob.c -+++ b/posix/glob.c -@@ -790,7 +790,7 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), - *p = '\0'; - } - else -- *((char *) mempcpy (newp, dirname + 1, end_name - dirname)) -+ *((char *) mempcpy (newp, dirname + 1, end_name - dirname - 1)) - = '\0'; - user_name = newp; - }