lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Check d_ino/d_off before using getdents syscall

Browse Source
This commit is contained in:
H.J. Lu
2012-05-18 07:12:47 -07:00
parent 94b07d20dd
commit 7cd195df62
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-05-18 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/getdents.c (__GETDENTS): Use
getdents system call only if kernel and user dirents have the
same d_ino and d_off.
* stdio-common/_itoa.c: Check _ITOA_NEEDED instead of
LLONG_MAX != LONG_MAX.
(_itoa_word): Use _ITOA_WORD_TYPE on value.

15
sysdeps/unix/sysv/linux/getdents.c
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1993, 1995-2004, 2006, 2007, 2010
Free Software Foundation, Inc.
/* Copyright (C) 19932-2012 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
@ -99,7 +98,17 @@ __GETDENTS (int fd, char *buf, size_t nbytes)
ssize_t retval;
#ifdef __ASSUME_GETDENTS32_D_TYPE
if (sizeof (DIRENT_TYPE) == sizeof (struct dirent))
/* The d_ino and d_off fields in kernel_dirent and dirent must have
the same sizes and alignments. */
if (sizeof (DIRENT_TYPE) == sizeof (struct dirent)
&& (sizeof (((struct kernel_dirent *) 0)->d_ino)
== sizeof (((struct dirent *) 0)->d_ino))
&& (sizeof (((struct kernel_dirent *) 0)->d_off)
== sizeof (((struct dirent *) 0)->d_off))
&& (offsetof (struct kernel_dirent, d_off)
== offsetof (struct dirent, d_off))
&& (offsetof (struct kernel_dirent, d_reclen)
== offsetof (struct dirent, d_reclen)))
{
retval = INLINE_SYSCALL (getdents, 3, fd, CHECK_N(buf, nbytes), nbytes);