23 lines
927 B
Diff
23 lines
927 B
Diff
|
Fix CVE-2019-19126:
|
||
|
|
|
||
|
|
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19126
|
||
|
|
https://sourceware.org/bugzilla/show_bug.cgi?id=25204
|
||
|
|
|
||
|
|
Taken from upstream:
|
||
|
|
https://sourceware.org/git/?p=glibc.git;a=commit;h=37c90e117310728a4ad1eb998c0bbe7d79c4a398
|
||
|
|
|
||
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
|
||
|
|
index 975cbe2..df2cdfd 100644
|
||
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
|
||
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
|
||
|
|
@@ -31,7 +31,8 @@
|
||
|
|
environment variable, LD_PREFER_MAP_32BIT_EXEC. */
|
||
|
|
#define EXTRA_LD_ENVVARS \
|
||
|
|
case 21: \
|
||
|
|
- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
|
||
|
|
+ if (!__libc_enable_secure \
|
||
|
|
+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
|
||
|
|
GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
|
||
|
|
|= bit_arch_Prefer_MAP_32BIT_EXEC; \
|
||
|
|
break;
|