Andreas Schwab
5f9962d8aa
- resolv-mem-leak.patch: Fix resource leak in resolver (BZ #19257) - tzset-tzname.patch: Force rereading TZDEFRULES after it was used to set DST rules only (BZ #19253) - glibc-2.3.90-noversion.diff: use stat64 - ld-pointer-guard.patch: Always enable pointer guard (bsc#950944, BZ #18928) OBS-URL: https://build.opensuse.org/request/show/345159 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=419
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
2015-10-15 Florian Weimer <fweimer@redhat.com>
|
|
|
|
[BZ #18928]
|
|
* sysdeps/generic/ldsodefs.h (struct rtld_global_ro): Remove
|
|
_dl_pointer_guard member.
|
|
* elf/rtld.c (_rtld_global_ro): Remove _dl_pointer_guard
|
|
initializer.
|
|
(security_init): Always set up pointer guard.
|
|
(process_envvars): Do not process LD_POINTER_GUARD.
|
|
|
|
Index: glibc-2.22/elf/rtld.c
|
|
===================================================================
|
|
--- glibc-2.22.orig/elf/rtld.c
|
|
+++ glibc-2.22/elf/rtld.c
|
|
@@ -162,7 +162,6 @@ struct rtld_global_ro _rtld_global_ro at
|
|
._dl_hwcap_mask = HWCAP_IMPORTANT,
|
|
._dl_lazy = 1,
|
|
._dl_fpu_control = _FPU_DEFAULT,
|
|
- ._dl_pointer_guard = 1,
|
|
._dl_pagesize = EXEC_PAGESIZE,
|
|
._dl_inhibit_cache = 0,
|
|
|
|
@@ -709,15 +708,12 @@ security_init (void)
|
|
#endif
|
|
|
|
/* Set up the pointer guard as well, if necessary. */
|
|
- if (GLRO(dl_pointer_guard))
|
|
- {
|
|
- uintptr_t pointer_chk_guard = _dl_setup_pointer_guard (_dl_random,
|
|
- stack_chk_guard);
|
|
+ uintptr_t pointer_chk_guard
|
|
+ = _dl_setup_pointer_guard (_dl_random, stack_chk_guard);
|
|
#ifdef THREAD_SET_POINTER_GUARD
|
|
- THREAD_SET_POINTER_GUARD (pointer_chk_guard);
|
|
+ THREAD_SET_POINTER_GUARD (pointer_chk_guard);
|
|
#endif
|
|
- __pointer_chk_guard_local = pointer_chk_guard;
|
|
- }
|
|
+ __pointer_chk_guard_local = pointer_chk_guard;
|
|
|
|
/* We do not need the _dl_random value anymore. The less
|
|
information we leave behind, the better, so clear the
|
|
@@ -2517,9 +2513,6 @@ process_envvars (enum mode *modep)
|
|
GLRO(dl_use_load_bias) = envline[14] == '1' ? -1 : 0;
|
|
break;
|
|
}
|
|
-
|
|
- if (memcmp (envline, "POINTER_GUARD", 13) == 0)
|
|
- GLRO(dl_pointer_guard) = envline[14] != '0';
|
|
break;
|
|
|
|
case 14:
|
|
Index: glibc-2.22/sysdeps/generic/ldsodefs.h
|
|
===================================================================
|
|
--- glibc-2.22.orig/sysdeps/generic/ldsodefs.h
|
|
+++ glibc-2.22/sysdeps/generic/ldsodefs.h
|
|
@@ -592,9 +592,6 @@ struct rtld_global_ro
|
|
/* List of auditing interfaces. */
|
|
struct audit_ifaces *_dl_audit;
|
|
unsigned int _dl_naudit;
|
|
-
|
|
- /* 0 if internal pointer values should not be guarded, 1 if they should. */
|
|
- EXTERN int _dl_pointer_guard;
|
|
};
|
|
# define __rtld_global_attribute__
|
|
# if IS_IN (rtld)
|