lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Handle unnecessary padding in getdents64.

Browse Source 
The getdents64 syscall adds on 32-but platforms padding which isn't needed
and not included in the userlevel data structure definition.  We have to
avoid copying those padding bytes in the readdir64_r function.
This commit is contained in:
Ulrich Drepper
2010-04-03 23:51:40 -07:00
parent 3fedf0feb7
commit 1a81139728
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2010-04-03 Ulrich Drepper <drepper@redhat.com> 2010-04-03 Ulrich Drepper <drepper@redhat.com>
[BZ #11333]
* sysdeps/unix/readdir_r.c (__READDIR_R): Add support for platforms
which include unnecessary padding in d_reclen.
* sysdeps/unix/sysv/linux/i386/readdir64_r.c: Select work-around for
unnecessary padding.
[BZ #11387] [BZ #11387]
* sysdeps/unix/sysv/linux/ifaddrs.c (map_newlin): Don't abort on * sysdeps/unix/sysv/linux/ifaddrs.c (map_newlin): Don't abort on
unknown interface, return -1. unknown interface, return -1.

14
sysdeps/unix/readdir_r.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,02 /* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,02,10
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -113,7 +113,17 @@ __READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
while (dp->d_ino == 0); while (dp->d_ino == 0);
if (dp != NULL) if (dp != NULL)
*result = memcpy (entry, dp, reclen); {
#ifdef GETDENTS_64BIT_ALIGNED
/* The d_reclen value might include padding which is not part of
the DIRENT_TYPE data structure. */
reclen = MIN (reclen, sizeof (DIRENT_TYPE));
#endif
*result = memcpy (entry, dp, reclen);
#ifdef GETDENTS_64BIT_ALIGNED
entry->d_reclen = reclen;
#endif
}
else else
*result = NULL; *result = NULL;

3
sysdeps/unix/sysv/linux/i386/readdir64_r.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2004 Free Software Foundation, Inc. /* Copyright (C) 2000, 2004, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -19,6 +19,7 @@
#define __READDIR_R __readdir64_r #define __READDIR_R __readdir64_r
#define __GETDENTS __getdents64 #define __GETDENTS __getdents64
#define DIRENT_TYPE struct dirent64 #define DIRENT_TYPE struct dirent64
#define GETDENTS_64BIT_ALIGNED 1
#include <sysdeps/unix/readdir_r.c> #include <sysdeps/unix/readdir_r.c>