OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/unix/sysv/linux/i386/sysdep.h (PTR_MANGLE): Roll value before

Browse Source 
returning.
	(PTR_DEMANGLE): Real definition now that it's not the same as
	PRT_MANGLE anymore.
	* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.

	* string/strerror_l.c: New file.
	* string/Makefile (routines): Add strerror_l.
	* string/string.h: Declare strerror_l.
	* string/Versions: Export strerror_l for GLIBC_2.6.

	* nscd/connections.c (nscd_run): Don't define MAXKEYLEN here.
This commit is contained in:
Ulrich Drepper 2007-02-01 16:14:15 +00:00
parent 58a2d52e95
commit 4a44ce79c6
9 changed files with 134 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,16 @@
2007-02-01 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysdep.h (PTR_MANGLE): Roll value before
returning.
(PTR_DEMANGLE): Real definition now that it's not the same as
PRT_MANGLE anymore.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* string/strerror_l.c: New file.
* string/Makefile (routines): Add strerror_l.
* string/string.h: Declare strerror_l.
* string/Versions: Export strerror_l for GLIBC_2.6.
2007-01-31 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd_helper.c (open_socket): Now takes request type and key
@ -5,6 +18,7 @@
before the first poll use, it usually succeeds. Adjust all
callers.
* nscd/nscd-client.h: Define MAXKEYLEN.
* nscd/connections.c (nscd_run): Don't define MAXKEYLEN here.
2007-01-31 Jakub Jelinek <jakub@redhat.com>

4
NEWS
View File

@ -1,4 +1,4 @@
GNU C Library NEWS -- history of user-visible changes. 2007-1-13
GNU C Library NEWS -- history of user-visible changes. 2007-2-1
Copyright (C) 1992-2006, 2007 Free Software Foundation, Inc.
See the end for copying conditions.
@ -9,6 +9,8 @@ Version 2.6
* New Linux interfaces: epoll_pwait.
* New generic interfaces: strerror_l.
* nscd can now cache the services database. Implemented by Ulrich Drepper.

1
nscd/connections.c
View File

@ -1430,7 +1430,6 @@ nscd_run (void *p)
/* It should not be possible to crash the nscd with a silly
request (i.e., a terribly large key). We limit the size to 1kb. */
#define MAXKEYLEN 1024
if (__builtin_expect (req.key_len, 1) < 0
|| __builtin_expect (req.key_len, 1) > MAXKEYLEN)
{

2
string/Makefile
View File

@ -40,7 +40,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
addsep replace) \
envz basename \
strcoll_l strxfrm_l string-inlines memrchr \
xpg-strerror
xpg-strerror strerror_l
# Gcc internally generates calls to unbounded memcpy and memset
# for -fbounded-pointer compiles. Glibc uses memchr for explicit checks.

3
string/Versions
View File

@ -77,4 +77,7 @@ libc {
# x*
__xpg_strerror_r;
}
GLIBC_2.6 {
strerror_l;
}
}

71
string/strerror_l.c Normal file
View File

@ -0,0 +1,71 @@
/* Copyright (C) 2007 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <libintl.h>
#include <locale.h>
#include <stdio.h>
#include <string.h>
#include <sys/param.h>
static __thread char *last_value;
static const char *
translate (const char *str, locale_t loc)
{
locale_t oldloc = __uselocale (loc);
const char *res = _(str);
__uselocale (oldloc);
return res;
}
/* Return a string describing the errno code in ERRNUM. */
char *
strerror_l (int errnum, locale_t loc)
{
if (__builtin_expect (errnum < 0 || errnum >= _sys_nerr_internal
|| _sys_errlist_internal[errnum] == NULL, 0))
{
free (last_value);
if (__asprintf (&last_value, "%s%d",
translate ("Unknown error ", loc), errnum) == -1)
last_value = NULL;
return last_value;
}
return (char *) translate (_sys_errlist_internal[errnum], loc);
}
#ifdef _LIBC
# ifdef _LIBC_REENTRANT
/* This is called when a thread is exiting to free the last_value string. */
static void __attribute__ ((section ("__libc_thread_freeres_fn")))
strerror_thread_freeres (void)
{
free (last_value);
}
text_set_element (__libc_thread_subfreeres, strerror_thread_freeres);
text_set_element (__libc_subfreeres, strerror_thread_freeres);
# endif
#endif

8
string/string.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-1993, 1995-2003, 2004 Free Software Foundation, Inc.
/* Copyright (C) 1991-1993, 1995-2004, 2007 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
@ -283,6 +283,12 @@ extern char *strerror_r (int __errnum, char *__buf, size_t __buflen)
# endif
#endif
#ifdef __USE_GNU
/* Translate error number to string according to the locale L. */
extern char *strerror_l (int __errnum, __locale_t __l) __THROW;
#endif
/* We define this function always since `bzero' is sometimes needed when
the namespace rules does not allow this. */
extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1));

18
sysdeps/unix/sysv/linux/i386/sysdep.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992,1993,1995-2000,2002-2005,2006
/* Copyright (C) 1992,1993,1995-2000,2002-2006,2007
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995.
@ -566,15 +566,23 @@ asm (".L__X'%ebx = 1\n\t"
is too complicated here since we have no PC-relative addressing mode. */
#else
# ifdef __ASSEMBLER__
# define PTR_MANGLE(reg) xorl %gs:POINTER_GUARD, reg
# define PTR_DEMANGLE(reg) PTR_MANGLE (reg)
# define PTR_MANGLE(reg) xorl %gs:POINTER_GUARD, reg; \
roll $9, reg
# define PTR_DEMANGLE(reg) rorl $9, reg; \
xorl %gs:POINTER_GUARD, reg
# else
# define PTR_MANGLE(var) asm ("xorl %%gs:%c2, %0" \
# define PTR_MANGLE(var) asm ("xorl %%gs:%c2, %0\n" \
"roll $9, %0" \
: "=r" (var) \
: "0" (var), \
"i" (offsetof (tcbhead_t, \
pointer_guard)))
# define PTR_DEMANGLE(var) asm ("rorl $9, %0\n" \
"xorl %%gs:%c2, %0" \
: "=r" (var) \
: "0" (var), \
"i" (offsetof (tcbhead_t, \
pointer_guard)))
# define PTR_DEMANGLE(var) PTR_MANGLE (var)
# endif
#endif

31
sysdeps/unix/sysv/linux/x86_64/sysdep.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
/* Copyright (C) 2001-2005, 2007 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
@ -317,24 +317,37 @@
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
# ifdef __ASSEMBLER__
# define PTR_MANGLE(reg) xorq __pointer_chk_guard_local(%rip), reg
# define PTR_DEMANGLE(reg) PTR_MANGLE (reg)
# define PTR_MANGLE(reg) xorq __pointer_chk_guard_local(%rip), reg; \
rolq $17, reg
# define PTR_DEMANGLE(reg) rorq $17, reg; \
xorq __pointer_chk_guard_local(%rip), reg
# else
# define PTR_MANGLE(reg) asm ("xorq __pointer_chk_guard_local(%%rip), %0"\
# define PTR_MANGLE(reg) asm ("xorq __pointer_chk_guard_local(%%rip), %0\n" \
"rolq $17, %0" \
: "=r" (reg) : "0" (reg))
# define PTR_DEMANGLE(reg) asm ("rorq $17, %0\n" \
"xorq __pointer_chk_guard_local(%%rip), %0" \
: "=r" (reg) : "0" (reg))
# define PTR_DEMANGLE(reg) PTR_MANGLE (reg)
# endif
#else
# ifdef __ASSEMBLER__
# define PTR_MANGLE(reg) xorq %fs:POINTER_GUARD, reg
# define PTR_DEMANGLE(reg) PTR_MANGLE (reg)
# define PTR_MANGLE(reg) xorq %fs:POINTER_GUARD, reg; \
rolq $17, reg
# define PTR_DEMANGLE(reg) rorq $17, reg; \
xorq %fs:POINTER_GUARD, reg
# else
# define PTR_MANGLE(var) asm ("xorq %%fs:%c2, %0" \
# define PTR_MANGLE(var) asm ("xorq %%fs:%c2, %0\n" \
"rolq $17, %0" \
: "=r" (var) \
: "0" (var), \
"i" (offsetof (tcbhead_t, \
pointer_guard)))
# define PTR_DEMANGLE(var) asm ("rorq $17, %0\n" \
"xorq %%fs:%c2, %0" \
: "=r" (var) \
: "0" (var), \
"i" (offsetof (tcbhead_t, \
pointer_guard)))
# define PTR_DEMANGLE(var) PTR_MANGLE (var)
# endif
#endif