[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r3303 - in /fsf/trunk/libc: ./ debug/ libio/bits/ nscd/
- To: commits@xxxxxxxxxx
- Subject: [commits] r3303 - in /fsf/trunk/libc: ./ debug/ libio/bits/ nscd/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 29 Aug 2007 07:02:54 -0000
Author: eglibc
Date: Wed Aug 29 00:02:53 2007
New Revision: 3303
Log:
Import glibc-mainline for 2007-08-29
Added:
fsf/trunk/libc/debug/fread_chk.c
fsf/trunk/libc/debug/fread_u_chk.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/debug/Makefile
fsf/trunk/libc/debug/Versions
fsf/trunk/libc/debug/tst-chk1.c
fsf/trunk/libc/libio/bits/stdio2.h
fsf/trunk/libc/nscd/connections.c
fsf/trunk/libc/nscd/nscd_helper.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Aug 29 00:02:53 2007
@@ -1,3 +1,29 @@
+2007-08-28 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * nscd/connections.c (send_ro_fd): Also transfer file size.
+ * nscd/nscd_helper.c (get_mapping): If nscd also transfers the
+ file size don't call fstat.
+
+ * nscd/nscd_helper.c (get_mapping): Avoid the pread call, just go
+ ahead and map the file. This should always be correct and we can
+ catch problems later.
+
+2007-08-28 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * libio/bits/stdio2.h (__fread_chk, __fread_unlocked_chk): New
+ prototypes.
+ (__fread_alias, __fread_unlocked_alias): New aliases.
+ (fread): New extern inline.
+ (fread_unlocked): Likewise. Undef macro before definition of
+ the inline function.
+ * debug/Makefile (routines): Add fread_chk and fread_u_chk.
+ (CFLAGS-fread_chk.c, CFLAGS-fread_u_chk.c): Add.
+ * debug/Versions (libc): Export __fread_chk@@GLIBC_2.7
+ and __fread_unlocked_chk@@GLIBC_2.7.
+ * debug/fread_chk.c: New file.
+ * debug/fread_u_chk.c: New file.
+ * debug/tst-chk1.c (do_test): Add fread and fread_unlocked tests.
+
2007-08-27 Jakub Jelinek <jakub@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/syscalls.list
Modified: fsf/trunk/libc/debug/Makefile
==============================================================================
--- fsf/trunk/libc/debug/Makefile (original)
+++ fsf/trunk/libc/debug/Makefile Wed Aug 29 00:02:53 2007
@@ -32,7 +32,7 @@
gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \
read_chk pread_chk pread64_chk recv_chk recvfrom_chk \
readlink_chk readlinkat_chk getwd_chk getcwd_chk \
- realpath_chk ptsname_r_chk \
+ realpath_chk ptsname_r_chk fread_chk fread_u_chk \
wctomb_chk wcscpy_chk wmemcpy_chk wmemmove_chk wmempcpy_chk \
wcpcpy_chk wcsncpy_chk wcscat_chk wcsncat_chk wmemset_chk \
wcpncpy_chk \
@@ -58,6 +58,8 @@
CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
CFLAGS-fgets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
CFLAGS-fgets_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
+CFLAGS-fread_chk.c = -D_IO_MTSAFE_IO $(exceptions)
+CFLAGS-fread_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
CFLAGS-swprintf_chk.c = -D_IO_MTSAFE_IO
CFLAGS-vswprintf_chk.c = -D_IO_MTSAFE_IO
CFLAGS-wprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
Modified: fsf/trunk/libc/debug/Versions
==============================================================================
--- fsf/trunk/libc/debug/Versions (original)
+++ fsf/trunk/libc/debug/Versions Wed Aug 29 00:02:53 2007
@@ -39,4 +39,7 @@
GLIBC_2.5 {
__readlinkat_chk;
}
+ GLIBC_2.7 {
+ __fread_chk; __fread_unlocked_chk;
+ }
}
Added: fsf/trunk/libc/debug/fread_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fread_chk.c (added)
+++ fsf/trunk/libc/debug/fread_chk.c Wed Aug 29 00:02:53 2007
@@ -1,0 +1,56 @@
+/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003, 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.
+
+ As a special exception, if you link the code in this file with
+ files compiled with a GNU compiler to produce an executable,
+ that does not cause the resulting executable to be covered by
+ the GNU Lesser General Public License. This exception does not
+ however invalidate any other reasons why the executable file
+ might be covered by the GNU Lesser General Public License.
+ This exception applies to code released by its copyright holders
+ in files containing the exception. */
+
+#include "libioP.h"
+#include <stdio.h>
+
+size_t
+__fread_chk (void *__restrict ptr, size_t ptrlen,
+ size_t size, size_t n, FILE *__restrict stream)
+{
+ size_t bytes_requested = size * n;
+ if (__builtin_expect ((n | size)
+ >= (((size_t) 1) << (8 * sizeof (size_t) / 2)), 0))
+ {
+ if (size != 0 && bytes_requested / size != n)
+ __chk_fail ();
+ }
+
+ if (__builtin_expect (bytes_requested > ptrlen, 0))
+ __chk_fail ();
+
+ CHECK_FILE (stream, 0);
+ if (bytes_requested == 0)
+ return 0;
+
+ size_t bytes_read;
+ _IO_acquire_lock (stream);
+ bytes_read = INTUSE(_IO_sgetn) (stream, (char *) ptr, bytes_requested);
+ _IO_release_lock (stream);
+ return bytes_requested == bytes_read ? n : bytes_read / size;
+}
Added: fsf/trunk/libc/debug/fread_u_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fread_u_chk.c (added)
+++ fsf/trunk/libc/debug/fread_u_chk.c Wed Aug 29 00:02:53 2007
@@ -1,0 +1,54 @@
+/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003, 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.
+
+ As a special exception, if you link the code in this file with
+ files compiled with a GNU compiler to produce an executable,
+ that does not cause the resulting executable to be covered by
+ the GNU Lesser General Public License. This exception does not
+ however invalidate any other reasons why the executable file
+ might be covered by the GNU Lesser General Public License.
+ This exception applies to code released by its copyright holders
+ in files containing the exception. */
+
+#include "libioP.h"
+#include <stdio.h>
+
+size_t
+__fread_unlocked_chk (void *__restrict ptr, size_t ptrlen,
+ size_t size, size_t n, FILE *__restrict stream)
+{
+ size_t bytes_requested = size * n;
+ if (__builtin_expect ((n | size)
+ >= (((size_t) 1) << (8 * sizeof (size_t) / 2)), 0))
+ {
+ if (size != 0 && bytes_requested / size != n)
+ __chk_fail ();
+ }
+
+ if (__builtin_expect (bytes_requested > ptrlen, 0))
+ __chk_fail ();
+
+ CHECK_FILE (stream, 0);
+ if (bytes_requested == 0)
+ return 0;
+
+ size_t bytes_read
+ = INTUSE(_IO_sgetn) (stream, (char *) ptr, bytes_requested);
+ return bytes_requested == bytes_read ? n : bytes_read / size;
+}
Modified: fsf/trunk/libc/debug/tst-chk1.c
==============================================================================
--- fsf/trunk/libc/debug/tst-chk1.c (original)
+++ fsf/trunk/libc/debug/tst-chk1.c Wed Aug 29 00:02:53 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2004.
@@ -746,6 +746,75 @@
CHK_FAIL_END
#endif
+ rewind (stdin);
+
+ if (fread (buf, 1, sizeof (buf), stdin) != sizeof (buf)
+ || memcmp (buf, "abcdefgh\nA", 10))
+ FAIL ();
+ if (fread (buf, sizeof (buf), 1, stdin) != 1
+ || memcmp (buf, "BCDEFGHI\na", 10))
+ FAIL ();
+
+ rewind (stdin);
+
+ if (fread (buf, l0 + 1, sizeof (buf), stdin) != sizeof (buf)
+ || memcmp (buf, "abcdefgh\nA", 10))
+ FAIL ();
+ if (fread (buf, sizeof (buf), l0 + 1, stdin) != 1
+ || memcmp (buf, "BCDEFGHI\na", 10))
+ FAIL ();
+
+#if __USE_FORTIFY_LEVEL >= 1
+ CHK_FAIL_START
+ if (fread (buf, 1, sizeof (buf) + 1, stdin) != sizeof (buf) + 1)
+ FAIL ();
+ CHK_FAIL_END
+
+ CHK_FAIL_START
+ if (fread (buf, sizeof (buf) + 1, l0 + 1, stdin) != 1)
+ FAIL ();
+ CHK_FAIL_END
+#endif
+
+ rewind (stdin);
+
+ if (fread_unlocked (buf, 1, sizeof (buf), stdin) != sizeof (buf)
+ || memcmp (buf, "abcdefgh\nA", 10))
+ FAIL ();
+ if (fread_unlocked (buf, sizeof (buf), 1, stdin) != 1
+ || memcmp (buf, "BCDEFGHI\na", 10))
+ FAIL ();
+
+ rewind (stdin);
+
+ if (fread_unlocked (buf, 1, 4, stdin) != 4
+ || memcmp (buf, "abcdFGHI\na", 10))
+ FAIL ();
+ if (fread_unlocked (buf, 4, 1, stdin) != 1
+ || memcmp (buf, "efghFGHI\na", 10))
+ FAIL ();
+
+ rewind (stdin);
+
+ if (fread_unlocked (buf, l0 + 1, sizeof (buf), stdin) != sizeof (buf)
+ || memcmp (buf, "abcdefgh\nA", 10))
+ FAIL ();
+ if (fread_unlocked (buf, sizeof (buf), l0 + 1, stdin) != 1
+ || memcmp (buf, "BCDEFGHI\na", 10))
+ FAIL ();
+
+#if __USE_FORTIFY_LEVEL >= 1
+ CHK_FAIL_START
+ if (fread_unlocked (buf, 1, sizeof (buf) + 1, stdin) != sizeof (buf) + 1)
+ FAIL ();
+ CHK_FAIL_END
+
+ CHK_FAIL_START
+ if (fread_unlocked (buf, sizeof (buf) + 1, l0 + 1, stdin) != 1)
+ FAIL ();
+ CHK_FAIL_END
+#endif
+
lseek (fileno (stdin), 0, SEEK_SET);
if (read (fileno (stdin), buf, sizeof (buf) - 1) != sizeof (buf) - 1
Modified: fsf/trunk/libc/libio/bits/stdio2.h
==============================================================================
--- fsf/trunk/libc/libio/bits/stdio2.h (original)
+++ fsf/trunk/libc/libio/bits/stdio2.h Wed Aug 29 00:02:53 2007
@@ -98,6 +98,27 @@
return __fgets_alias (__s, __n, __stream);
}
+extern size_t __fread_chk (void *__restrict __ptr, size_t __ptrlen,
+ size_t __size, size_t __n,
+ FILE *__restrict __stream) __wur;
+extern size_t __REDIRECT (__fread_alias,
+ (void *__restrict __ptr, size_t __size,
+ size_t __n, FILE *__restrict __stream),
+ fread) __wur;
+
+__extern_always_inline __wur size_t
+fread (void *__restrict __ptr, size_t __size, size_t __n,
+ FILE *__restrict __stream)
+{
+ if (__bos0 (__ptr) != (size_t) -1
+ && (!__builtin_constant_p (__size)
+ || !__builtin_constant_p (__n)
+ || (__size | __n) >= (((size_t) 1) << (8 * sizeof (size_t) / 2))
+ || __size * __n > __bos0 (__ptr)))
+ return __fread_chk (__ptr, __bos0 (__ptr), __size, __n, __stream);
+ return __fread_alias (__ptr, __size, __n, __stream);
+}
+
#ifdef __USE_GNU
extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
int __n, FILE *__restrict __stream) __wur;
@@ -114,3 +135,49 @@
return __fgets_unlocked_alias (__s, __n, __stream);
}
#endif
+
+#ifdef __USE_MISC
+# undef fread_unlocked
+extern size_t __fread_unlocked_chk (void *__restrict __ptr, size_t __ptrlen,
+ size_t __size, size_t __n,
+ FILE *__restrict __stream) __wur;
+extern size_t __REDIRECT (__fread_unlocked_alias,
+ (void *__restrict __ptr, size_t __size,
+ size_t __n, FILE *__restrict __stream),
+ fread_unlocked) __wur;
+
+__extern_always_inline __wur size_t
+fread_unlocked (void *__restrict __ptr, size_t __size, size_t __n,
+ FILE *__restrict __stream)
+{
+ if (__bos0 (__ptr) != (size_t) -1
+ && (!__builtin_constant_p (__size)
+ || !__builtin_constant_p (__n)
+ || (__size | __n) >= (((size_t) 1) << (8 * sizeof (size_t) / 2))
+ || __size * __n > __bos0 (__ptr)))
+ return __fread_unlocked_chk (__ptr, __bos0 (__ptr), __size, __n, __stream);
+
+# ifdef __USE_EXTERN_INLINES
+ if (__builtin_constant_p (__size)
+ && __builtin_constant_p (__n)
+ && (__size | __n) < (((size_t) 1) << (8 * sizeof (size_t) / 2))
+ && __size * __n <= 8)
+ {
+ size_t __cnt = __size * __n;
+ char *__cptr = (char *) __ptr;
+ if (__cnt == 0)
+ return 0;
+
+ for (; __cnt > 0; --__cnt)
+ {
+ int __c = _IO_getc_unlocked (__stream);
+ if (__c == EOF)
+ break;
+ *__cptr++ = __c;
+ }
+ return (__cptr - (char *) __ptr) / __size;
+ }
+# endif
+ return __fread_unlocked_alias (__ptr, __size, __n, __stream);
+}
+#endif
Modified: fsf/trunk/libc/nscd/connections.c
==============================================================================
--- fsf/trunk/libc/nscd/connections.c (original)
+++ fsf/trunk/libc/nscd/connections.c Wed Aug 29 00:02:53 2007
@@ -907,9 +907,14 @@
return;
/* We need to send some data along with the descriptor. */
- struct iovec iov[1];
+ uint64_t mapsize = (db->head->data_size
+ + roundup (db->head->module * sizeof (ref_t), ALIGN)
+ + sizeof (struct database_pers_head));
+ struct iovec iov[2];
iov[0].iov_base = key;
iov[0].iov_len = strlen (key) + 1;
+ iov[1].iov_base = &mapsize;
+ iov[1].iov_len = sizeof (mapsize);
/* Prepare the control message to transfer the descriptor. */
union
@@ -917,7 +922,7 @@
struct cmsghdr hdr;
char bytes[CMSG_SPACE (sizeof (int))];
} buf;
- struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 1,
+ struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 2,
.msg_control = buf.bytes,
.msg_controllen = sizeof (buf) };
struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
Modified: fsf/trunk/libc/nscd/nscd_helper.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_helper.c (original)
+++ fsf/trunk/libc/nscd/nscd_helper.c Wed Aug 29 00:02:53 2007
@@ -238,16 +238,19 @@
/* Room for the data sent along with the file descriptor. We expect
the key name back. */
- struct iovec iov[1];
+ uint64_t mapsize;
+ struct iovec iov[2];
iov[0].iov_base = resdata;
iov[0].iov_len = keylen;
+ iov[1].iov_base = &mapsize;
+ iov[1].iov_len = sizeof (mapsize);
union
{
struct cmsghdr hdr;
char bytes[CMSG_SPACE (sizeof (int))];
} buf;
- struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 1,
+ struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 2,
.msg_control = buf.bytes,
.msg_controllen = sizeof (buf) };
struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
@@ -268,10 +271,7 @@
# ifndef MSG_CMSG_CLOEXEC
# define MSG_CMSG_CLOEXEC 0
# endif
- if (__builtin_expect (TEMP_FAILURE_RETRY (__recvmsg (sock, &msg,
- MSG_CMSG_CLOEXEC))
- != keylen, 0))
- goto out_close2;
+ ssize_t n = TEMP_FAILURE_RETRY (__recvmsg (sock, &msg, MSG_CMSG_CLOEXEC));
if (__builtin_expect (CMSG_FIRSTHDR (&msg) == NULL
|| (CMSG_FIRSTHDR (&msg)->cmsg_len
@@ -280,51 +280,61 @@
mapfd = *(int *) CMSG_DATA (cmsg);
- struct stat64 st;
- if (__builtin_expect (strcmp (resdata, key) != 0, 0)
- || __builtin_expect (fstat64 (mapfd, &st) != 0, 0)
- || __builtin_expect (st.st_size < sizeof (struct database_pers_head), 0))
+ if (__builtin_expect (n != keylen && n != keylen + sizeof (mapsize), 0))
goto out_close;
- struct database_pers_head head;
- if (__builtin_expect (TEMP_FAILURE_RETRY (__pread (mapfd, &head,
- sizeof (head), 0))
- != sizeof (head), 0))
+ if (__builtin_expect (strcmp (resdata, key) != 0, 0))
goto out_close;
- if (__builtin_expect (head.version != DB_VERSION, 0)
- || __builtin_expect (head.header_size != sizeof (head), 0)
- /* This really should not happen but who knows, maybe the update
- thread got stuck. */
- || __builtin_expect (! head.nscd_certainly_running
- && head.timestamp + MAPPING_TIMEOUT < time (NULL),
- 0))
- goto out_close;
-
- size_t size = (sizeof (head) + roundup (head.module * sizeof (ref_t), ALIGN)
- + head.data_size);
-
- if (__builtin_expect (st.st_size < size, 0))
- goto out_close;
+ if (__builtin_expect (n == keylen, 0))
+ {
+ struct stat64 st;
+ if (__builtin_expect (fstat64 (mapfd, &st) != 0, 0)
+ || __builtin_expect (st.st_size < sizeof (struct database_pers_head),
+ 0))
+ goto out_close;
+
+ mapsize = st.st_size;
+ }
/* The file is large enough, map it now. */
- void *mapping = __mmap (NULL, size, PROT_READ, MAP_SHARED, mapfd, 0);
+ void *mapping = __mmap (NULL, mapsize, PROT_READ, MAP_SHARED, mapfd, 0);
if (__builtin_expect (mapping != MAP_FAILED, 1))
{
+ /* Check whether the database is correct and up-to-date. */
+ struct database_pers_head *head = mapping;
+
+ if (__builtin_expect (head->version != DB_VERSION, 0)
+ || __builtin_expect (head->header_size != sizeof (*head), 0)
+ /* This really should not happen but who knows, maybe the update
+ thread got stuck. */
+ || __builtin_expect (! head->nscd_certainly_running
+ && (head->timestamp + MAPPING_TIMEOUT
+ < time (NULL)), 0))
+ {
+ out_unmap:
+ __munmap (mapping, mapsize);
+ goto out_close;
+ }
+
+ size_t size = (sizeof (*head) + roundup (head->module * sizeof (ref_t),
+ ALIGN)
+ + head->data_size);
+
+ if (__builtin_expect (mapsize < size, 0))
+ goto out_unmap;
+
/* Allocate a record for the mapping. */
struct mapped_database *newp = malloc (sizeof (*newp));
if (newp == NULL)
- {
- /* Ugh, after all we went through the memory allocation failed. */
- __munmap (mapping, size);
- goto out_close;
- }
+ /* Ugh, after all we went through the memory allocation failed. */
+ goto out_unmap;
newp->head = mapping;
- newp->data = ((char *) mapping + head.header_size
- + roundup (head.module * sizeof (ref_t), ALIGN));
+ newp->data = ((char *) mapping + head->header_size
+ + roundup (head->module * sizeof (ref_t), ALIGN));
newp->mapsize = size;
- newp->datasize = head.data_size;
+ newp->datasize = head->data_size;
/* Set counter to 1 to show it is usable. */
newp->counter = 1;