[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r11903 - in /fsf/glibc-2_12-branch/libc: ./ elf/ include/ nptl/ nptl/sysdeps/x86_64/ sysdeps/generic/ sysdeps/x86_64/multiarch/
- To: commits@xxxxxxxxxx
- Subject: [commits] r11903 - in /fsf/glibc-2_12-branch/libc: ./ elf/ include/ nptl/ nptl/sysdeps/x86_64/ sysdeps/generic/ sysdeps/x86_64/multiarch/
- From: eglibc@xxxxxxxxxx
- Date: Fri, 29 Oct 2010 07:06:29 -0000
Author: eglibc
Date: Fri Oct 29 00:06:28 2010
New Revision: 11903
Log:
Import glibc-2.12 for 2010-10-29
Modified:
fsf/glibc-2_12-branch/libc/ChangeLog
fsf/glibc-2_12-branch/libc/elf/dl-deps.c
fsf/glibc-2_12-branch/libc/elf/dl-load.c
fsf/glibc-2_12-branch/libc/elf/dl-open.c
fsf/glibc-2_12-branch/libc/elf/rtld.c
fsf/glibc-2_12-branch/libc/include/dlfcn.h
fsf/glibc-2_12-branch/libc/nptl/ChangeLog
fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/pthreaddef.h
fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/tls.h
fsf/glibc-2_12-branch/libc/sysdeps/generic/ldsodefs.h
fsf/glibc-2_12-branch/libc/sysdeps/x86_64/multiarch/strchr.S
Modified: fsf/glibc-2_12-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_12-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_12-branch/libc/ChangeLog Fri Oct 29 00:06:28 2010
@@ -1,3 +1,25 @@
+2010-10-25 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #12159]
+ * sysdeps/x86_64/multiarch/strchr.S: Fix propagation of search byte
+ into all bytes of SSE register.
+ Patch by Richard Li <richardpku@xxxxxxxxx>.
+
+2010-10-22 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * include/dlfcn.h (__RTLD_SECURE): Define.
+ * elf/dl-load.c (_dl_map_object): Remove preloaded parameter. Use
+ mode & __RTLD_SECURE instead.
+ (open_path): Rename preloaded parameter to secure.
+ * sysdeps/generic/ldsodefs.h (_dl_map_object): Adjust declaration.
+ * elf/dl-open.c (dl_open_worker): Adjust call to _dl_map_object.
+ * elf/dl-deps.c (openaux): Likewise.
+ * elf/rtld.c (struct map_args): Remove is_preloaded.
+ (map_doit): Don't use it.
+ (dl_main): Likewise.
+ (do_preload): Use __RTLD_SECURE instead of is_preloaded.
+ (dlmopen_doit): Add __RTLD_SECURE to mode bits.
+
2010-10-06 Ulrich Drepper <drepper@xxxxxxxxx>
* string/bug-strstr1.c: New file.
Modified: fsf/glibc-2_12-branch/libc/elf/dl-deps.c
==============================================================================
--- fsf/glibc-2_12-branch/libc/elf/dl-deps.c (original)
+++ fsf/glibc-2_12-branch/libc/elf/dl-deps.c Fri Oct 29 00:06:28 2010
@@ -62,7 +62,7 @@
{
struct openaux_args *args = (struct openaux_args *) a;
- args->aux = _dl_map_object (args->map, args->name, 0,
+ args->aux = _dl_map_object (args->map, args->name,
(args->map->l_type == lt_executable
? lt_library : args->map->l_type),
args->trace_mode, args->open_mode,
Modified: fsf/glibc-2_12-branch/libc/elf/dl-load.c
==============================================================================
--- fsf/glibc-2_12-branch/libc/elf/dl-load.c (original)
+++ fsf/glibc-2_12-branch/libc/elf/dl-load.c Fri Oct 29 00:06:28 2010
@@ -1815,7 +1815,7 @@
if MAY_FREE_DIRS is true. */
static int
-open_path (const char *name, size_t namelen, int preloaded,
+open_path (const char *name, size_t namelen, int secure,
struct r_search_path_struct *sps, char **realname,
struct filebuf *fbp, struct link_map *loader, int whatcode,
bool *found_other_class)
@@ -1897,7 +1897,7 @@
/* Remember whether we found any existing directory. */
here_any |= this_dir->status[cnt] != nonexisting;
- if (fd != -1 && __builtin_expect (preloaded, 0)
+ if (fd != -1 && __builtin_expect (secure, 0)
&& INTUSE(__libc_enable_secure))
{
/* This is an extra security effort to make sure nobody can
@@ -1966,7 +1966,7 @@
struct link_map *
internal_function
-_dl_map_object (struct link_map *loader, const char *name, int preloaded,
+_dl_map_object (struct link_map *loader, const char *name,
int type, int trace_mode, int mode, Lmid_t nsid)
{
int fd;
@@ -2070,7 +2070,8 @@
for (l = loader; l; l = l->l_loader)
if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH"))
{
- fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
+ fd = open_path (name, namelen, mode & __RTLD_SECURE,
+ &l->l_rpath_dirs,
&realname, &fb, loader, LA_SER_RUNPATH,
&found_other_class);
if (fd != -1)
@@ -2085,14 +2086,15 @@
&& main_map != NULL && main_map->l_type != lt_loaded
&& cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
"RPATH"))
- fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs,
+ fd = open_path (name, namelen, mode & __RTLD_SECURE,
+ &main_map->l_rpath_dirs,
&realname, &fb, loader ?: main_map, LA_SER_RUNPATH,
&found_other_class);
}
/* Try the LD_LIBRARY_PATH environment variable. */
if (fd == -1 && env_path_list.dirs != (void *) -1)
- fd = open_path (name, namelen, preloaded, &env_path_list,
+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list,
&realname, &fb,
loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
LA_SER_LIBPATH, &found_other_class);
@@ -2101,12 +2103,12 @@
if (fd == -1 && loader != NULL
&& cache_rpath (loader, &loader->l_runpath_dirs,
DT_RUNPATH, "RUNPATH"))
- fd = open_path (name, namelen, preloaded,
+ fd = open_path (name, namelen, mode & __RTLD_SECURE,
&loader->l_runpath_dirs, &realname, &fb, loader,
LA_SER_RUNPATH, &found_other_class);
if (fd == -1
- && (__builtin_expect (! preloaded, 1)
+ && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
|| ! INTUSE(__libc_enable_secure)))
{
/* Check the list of libraries in the file /etc/ld.so.cache,
@@ -2172,7 +2174,7 @@
&& ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
|| __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
&& rtld_search_dirs.dirs != (void *) -1)
- fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
/* Add another newline when we are tracing the library loading. */
Modified: fsf/glibc-2_12-branch/libc/elf/dl-open.c
==============================================================================
--- fsf/glibc-2_12-branch/libc/elf/dl-open.c (original)
+++ fsf/glibc-2_12-branch/libc/elf/dl-open.c Fri Oct 29 00:06:28 2010
@@ -252,7 +252,7 @@
/* Load the named object. */
struct link_map *new;
- args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,
+ args->map = new = _dl_map_object (call_map, file, lt_loaded, 0,
mode | __RTLD_CALLMAP, args->nsid);
/* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
Modified: fsf/glibc-2_12-branch/libc/elf/rtld.c
==============================================================================
--- fsf/glibc-2_12-branch/libc/elf/rtld.c (original)
+++ fsf/glibc-2_12-branch/libc/elf/rtld.c Fri Oct 29 00:06:28 2010
@@ -589,7 +589,6 @@
/* Argument to map_doit. */
char *str;
struct link_map *loader;
- int is_preloaded;
int mode;
/* Return value of map_doit. */
struct link_map *map;
@@ -627,16 +626,17 @@
map_doit (void *a)
{
struct map_args *args = (struct map_args *) a;
- args->map = _dl_map_object (args->loader, args->str,
- args->is_preloaded, lt_library, 0, args->mode,
- LM_ID_BASE);
+ args->map = _dl_map_object (args->loader, args->str, lt_library, 0,
+ args->mode, LM_ID_BASE);
}
static void
dlmopen_doit (void *a)
{
struct dlmopen_args *args = (struct dlmopen_args *) a;
- args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT,
+ args->map = _dl_open (args->fname,
+ (RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT
+ | __RTLD_SECURE),
dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv),
__environ);
}
@@ -806,8 +806,7 @@
args.str = fname;
args.loader = main_map;
- args.is_preloaded = 1;
- args.mode = 0;
+ args.mode = __RTLD_SECURE;
unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
@@ -1054,7 +1053,6 @@
args.str = rtld_progname;
args.loader = NULL;
- args.is_preloaded = 0;
args.mode = __RTLD_OPENEXEC;
(void) _dl_catch_error (&objname, &err_str, &malloced, map_doit,
&args);
@@ -1066,7 +1064,7 @@
else
{
HP_TIMING_NOW (start);
- _dl_map_object (NULL, rtld_progname, 0, lt_library, 0,
+ _dl_map_object (NULL, rtld_progname, lt_library, 0,
__RTLD_OPENEXEC, LM_ID_BASE);
HP_TIMING_NOW (stop);
Modified: fsf/glibc-2_12-branch/libc/include/dlfcn.h
==============================================================================
--- fsf/glibc-2_12-branch/libc/include/dlfcn.h (original)
+++ fsf/glibc-2_12-branch/libc/include/dlfcn.h Fri Oct 29 00:06:28 2010
@@ -9,6 +9,7 @@
#define __RTLD_OPENEXEC 0x20000000
#define __RTLD_CALLMAP 0x10000000
#define __RTLD_AUDIT 0x08000000
+#define __RTLD_SECURE 0x04000000 /* Apply additional security checks. */
#define __LM_ID_CALLER -2
Modified: fsf/glibc-2_12-branch/libc/nptl/ChangeLog
==============================================================================
--- fsf/glibc-2_12-branch/libc/nptl/ChangeLog (original)
+++ fsf/glibc-2_12-branch/libc/nptl/ChangeLog Fri Oct 29 00:06:28 2010
@@ -1,3 +1,10 @@
+2010-10-13 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #12113]
+ * sysdeps/x86_64/pthreaddef.h (TCB_ALIGNMENT): Changed to 32.
+ * sysdeps/x86_64/tls.h (TLS_TCB_ALIGN): Defined with alignment
+ of "struct pthread".
+
2010-06-01 Takashi Yoshii <takashi.yoshii.zj@xxxxxxxxxxx>
* sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect
Modified: fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/pthreaddef.h
==============================================================================
--- fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/pthreaddef.h (original)
+++ fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/pthreaddef.h Fri Oct 29 00:06:28 2010
@@ -27,8 +27,9 @@
/* Minimal stack size after allocating thread descriptor and guard size. */
#define MINIMAL_REST_STACK 2048
-/* Alignment requirement for TCB. */
-#define TCB_ALIGNMENT 16
+/* Alignment requirement for TCB. Need to store post-AVX vector registers
+ in the TCB and we want the storage to be aligned at 32-byte. */
+#define TCB_ALIGNMENT 32
/* Location of current stack frame. The frame pointer is not usable. */
Modified: fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/tls.h
==============================================================================
--- fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/tls.h (original)
+++ fsf/glibc-2_12-branch/libc/nptl/sysdeps/x86_64/tls.h Fri Oct 29 00:06:28 2010
@@ -117,12 +117,7 @@
# define TLS_TCB_SIZE sizeof (struct pthread)
/* Alignment requirements for the TCB. */
-//# define TLS_TCB_ALIGN __alignof__ (struct pthread)
-// Normally the above would be correct But we have to store post-AVX
-// vector registers in the TCB and we want the storage to be aligned.
-// unfortunately there isn't yet a type for these values and hence no
-// 32-byte alignment requirement. Make this explicit, for now.
-# define TLS_TCB_ALIGN 32
+# define TLS_TCB_ALIGN __alignof__ (struct pthread)
/* The TCB can have any size and the memory following the address the
thread pointer points to is unspecified. Allocate the TCB there. */
Modified: fsf/glibc-2_12-branch/libc/sysdeps/generic/ldsodefs.h
==============================================================================
--- fsf/glibc-2_12-branch/libc/sysdeps/generic/ldsodefs.h (original)
+++ fsf/glibc-2_12-branch/libc/sysdeps/generic/ldsodefs.h Fri Oct 29 00:06:28 2010
@@ -824,11 +824,9 @@
/* Open the shared object NAME and map in its segments.
LOADER's DT_RPATH is used in searching for NAME.
- If the object is already opened, returns its existing map.
- For preloaded shared objects PRELOADED is set to a non-zero
- value to allow additional security checks. */
+ If the object is already opened, returns its existing map. */
extern struct link_map *_dl_map_object (struct link_map *loader,
- const char *name, int preloaded,
+ const char *name,
int type, int trace_mode, int mode,
Lmid_t nsid)
internal_function attribute_hidden;
Modified: fsf/glibc-2_12-branch/libc/sysdeps/x86_64/multiarch/strchr.S
==============================================================================
--- fsf/glibc-2_12-branch/libc/sysdeps/x86_64/multiarch/strchr.S (original)
+++ fsf/glibc-2_12-branch/libc/sysdeps/x86_64/multiarch/strchr.S Fri Oct 29 00:06:28 2010
@@ -1,5 +1,5 @@
/* strchr with SSE4.2
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -87,13 +87,13 @@
pxor %xmm2, %xmm2
movd %esi, %xmm1
movl %edi, %ecx
+ pshufb %xmm2, %xmm1
andl $15, %ecx
movq %rdi, %r8
je L(aligned_start)
/* Handle unaligned string. */
andq $-16, %r8
- pshufb %xmm2, %xmm1
movdqa (%r8), %xmm0
pcmpeqb %xmm0, %xmm2
pcmpeqb %xmm1, %xmm0