vapier 15/10/17 04:54:52
Modified: README.history
Added: 00_all_0023-Fix-non-v9-32-bit-sparc-build.patch
00_all_0024-BZ-18921-Fix-opendir-inverted-o_directory_works-test.patch
00_all_0025-Use-HOST_NAME_MAX-for-MAXHOSTNAMELEN-in-sys-param.h.patch
00_all_0026-Always-enable-pointer-guard-BZ-18928.patch
Log:
add more fixes from upstream
Revision Changes Path
1.9 src/patchsets/glibc/2.22/README.history
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/README.history?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/README.history?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/README.history?r1=1.8&r2=1.9
Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.22/README.history,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- README.history 26 Sep 2015 18:42:06 -0000 1.8
+++ README.history 17 Oct 2015 04:54:52 -0000 1.9
@@ -1,3 +1,9 @@
+9 17 Oct 2015
+ + 00_all_0023-Fix-non-v9-32-bit-sparc-build.patch
+ + 00_all_0024-BZ-18921-Fix-opendir-inverted-o_directory_works-test.patch
+ + 00_all_0025-Use-HOST_NAME_MAX-for-MAXHOSTNAMELEN-in-sys-param.h.patch
+ + 00_all_0026-Always-enable-pointer-guard-BZ-18928.patch
+
8 26 Sep 2015
+ 00_all_0022-BZ-17250-Fix-static-dlopen-default-library-search-pa.patch
1.1
src/patchsets/glibc/2.22/00_all_0023-Fix-non-v9-32-bit-sparc-build.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0023-Fix-non-v9-32-bit-sparc-build.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0023-Fix-non-v9-32-bit-sparc-build.patch?rev=1.1&content-type=text/plain
Index: 00_all_0023-Fix-non-v9-32-bit-sparc-build.patch
===================================================================
>From 6ff3aac23c2caa5c669e74da5f6c5a7264f51e39 Mon Sep 17 00:00:00 2001
From: Brett Neumeier <[email protected]>
Date: Mon, 31 Aug 2015 15:27:21 -0700
Subject: [PATCH] Fix non-v9 32-bit sparc build.
[BZ #18870]
* sysdeps/sparc/sparc32/sem_open.c: Add missing #include
(cherry picked from commit 36c6e27a26b0afe0187f8790990cf880abdbf244)
---
sysdeps/sparc/sparc32/sem_open.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sysdeps/sparc/sparc32/sem_open.c b/sysdeps/sparc/sparc32/sem_open.c
index 16cb9ad..59df2d7 100644
--- a/sysdeps/sparc/sparc32/sem_open.c
+++ b/sysdeps/sparc/sparc32/sem_open.c
@@ -29,6 +29,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include "semaphoreP.h"
+#include <futex-internal.h>
#include <shm-directory.h>
--
2.5.2
1.1
src/patchsets/glibc/2.22/00_all_0024-BZ-18921-Fix-opendir-inverted-o_directory_works-test.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0024-BZ-18921-Fix-opendir-inverted-o_directory_works-test.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0024-BZ-18921-Fix-opendir-inverted-o_directory_works-test.patch?rev=1.1&content-type=text/plain
Index: 00_all_0024-BZ-18921-Fix-opendir-inverted-o_directory_works-test.patch
===================================================================
>From cdb1aad567b85b880a1325eb88555b8c8da9159b Mon Sep 17 00:00:00 2001
From: Roland McGrath <[email protected]>
Date: Fri, 4 Sep 2015 14:37:56 -0700
Subject: [PATCH] BZ#18921: Fix opendir inverted o_directory_works test.
(cherry picked from commit bd9e69abb887d78d0d6708fc089cc9f3eabf106d)
(cherry picked from commit 5c8c3123652045191474a4ca85fbb6e8d9e7d2bc)
---
sysdeps/posix/opendir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
index 6509f5c..9edf056 100644
--- a/sysdeps/posix/opendir.c
+++ b/sysdeps/posix/opendir.c
@@ -105,7 +105,7 @@ need_isdir_precheck (void)
tryopen_o_directory ();
/* We can skip the expensive `stat' call if O_DIRECTORY works. */
- return o_directory_works > 0;
+ return o_directory_works < 0;
#endif
return true;
}
--
2.5.2
1.1
src/patchsets/glibc/2.22/00_all_0025-Use-HOST_NAME_MAX-for-MAXHOSTNAMELEN-in-sys-param.h.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0025-Use-HOST_NAME_MAX-for-MAXHOSTNAMELEN-in-sys-param.h.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0025-Use-HOST_NAME_MAX-for-MAXHOSTNAMELEN-in-sys-param.h.patch?rev=1.1&content-type=text/plain
Index: 00_all_0025-Use-HOST_NAME_MAX-for-MAXHOSTNAMELEN-in-sys-param.h.patch
===================================================================
>From 5c4ac5014823e2bc93f74d4a8ac5502f01a9753f Mon Sep 17 00:00:00 2001
From: Roland McGrath <[email protected]>
Date: Tue, 15 Sep 2015 15:27:58 -0700
Subject: [PATCH] Use HOST_NAME_MAX for MAXHOSTNAMELEN in <sys/param.h>.
(cherry picked from commit 51f24be7ba5d15313ae94f8fb4500ce07cb98c84)
(cherry picked from commit 666bb4dc55f5a93538d020024c34abad641f50ae)
---
misc/sys/param.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/misc/sys/param.h b/misc/sys/param.h
index 62b7ed2..1908b93 100644
--- a/misc/sys/param.h
+++ b/misc/sys/param.h
@@ -50,6 +50,9 @@
#if !defined NOFILE && defined OPEN_MAX
# define NOFILE OPEN_MAX
#endif
+#if !defined MAXHOSTNAMELEN && defined HOST_NAME_MAX
+# define MAXHOSTNAMELEN HOST_NAME_MAX
+#endif
#ifndef NCARGS
# ifdef ARG_MAX
# define NCARGS ARG_MAX
--
2.5.2
1.1
src/patchsets/glibc/2.22/00_all_0026-Always-enable-pointer-guard-BZ-18928.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0026-Always-enable-pointer-guard-BZ-18928.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.22/00_all_0026-Always-enable-pointer-guard-BZ-18928.patch?rev=1.1&content-type=text/plain
Index: 00_all_0026-Always-enable-pointer-guard-BZ-18928.patch
===================================================================
>From b3f7020fa16a9d2ab9318988949c5722531f9f02 Mon Sep 17 00:00:00 2001
From: Florian Weimer <[email protected]>
Date: Thu, 15 Oct 2015 09:23:07 +0200
Subject: [PATCH] Always enable pointer guard [BZ #18928]
Honoring the LD_POINTER_GUARD environment variable in AT_SECURE mode
has security implications. This commit enables pointer guard
unconditionally, and the environment variable is now ignored.
[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.
(cherry picked from commit a014cecd82b71b70a6a843e250e06b541ad524f7)
(cherry picked from commit dc22a1ec157d02529a0b17986679d3f1c122985e)
---
elf/rtld.c | 15 ++++-----------
sysdeps/generic/ldsodefs.h | 3 ---
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/elf/rtld.c b/elf/rtld.c
index 69873c2..07e741c 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -162,7 +162,6 @@ struct rtld_global_ro _rtld_global_ro attribute_relro =
._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
@@ -2471,9 +2467,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:
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 7a0fe8d..78e3a97 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/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)
--
2.5.2
