nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

glibc: 2.25-49 -> 2.25-123 to fix CVE-2018-1000001

Browse Source 
/cc https://github.com/NixOS/nixpkgs/issues/33826#issuecomment-357436030
Unstable/master uses 2.26-x, updated in 990ff97c6d.
This commit is contained in:
Vladimír Čunát
2018-01-17 23:09:16 +01:00
parent d9a2891c32
commit 0186286433
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkgs/development/libraries/glibc/2.25-49to123.diff.gz Normal file
View File

Binary file not shown.

5
pkgs/development/libraries/glibc/common.nix
View File

@@ -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. */

15
pkgs/development/libraries/glibc/cve-2017-15670.patch
View File

@@ -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;
}