r5786 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/kfreebsd
Author: ps-guest
Date: 2013-11-23 11:13:41 +0000 (Sat, 23 Nov 2013)
New Revision: 5786
Removed:
glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-readdir_r.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64
glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386
Log:
drop kfreebsd/local-readdir_r.diff, obsoleted by fix for CVE-2013-4237.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 08:17:36 UTC (rev 5785)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 11:13:41 UTC (rev 5786)
@@ -106,6 +106,7 @@
* drop obsolete kfreebsd/local-dosavesse.diff, local-pthread_at_fork.diff,
kfreebsd/local-nosavesse.diff, kfreebsd/local-use-thr-primitives.diff,
and kfreebsd/submitted-libc_once.diff.
+ * drop kfreebsd/local-readdir_r.diff, obsoleted by fix for CVE-2013-4237.
-- Adam Conrad <adconrad@ubuntu.com> Sat, 09 Nov 2013 12:48:20 +0100
Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-readdir_r.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-readdir_r.diff 2013-11-23 08:17:36 UTC (rev 5785)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-readdir_r.diff 2013-11-23 11:13:41 UTC (rev 5786)
@@ -1,47 +0,0 @@
----
- sysdeps/unix/readdir_r.c | 33 +++++++++++++++++++++++++--------
- 1 file changed, 25 insertions(+), 8 deletions(-)
-
---- a/sysdeps/posix/readdir_r.c
-+++ b/sysdeps/posix/readdir_r.c
-@@ -114,15 +114,32 @@
-
- if (dp != NULL)
- {
--#ifdef GETDENTS_64BIT_ALIGNED
-- /* The d_reclen value might include padding which is not part of
-- the DIRENT_TYPE data structure. */
-- reclen = MIN (reclen,
-- offsetof (DIRENT_TYPE, d_name) + sizeof (dp->d_name));
--#endif
-+ /* The required size of *entry, according to POSIX, is
-+ offsetof (DIRENT_TYPE, d_name[0]) + NAME_MAX + 1.
-+ We must not write beyond the end of *entry. On some operating
-+ systems, dp->d_reclen may be larger; in this case, copy only as
-+ many bytes as needed. Also give an error if d_name is too long. */
-+#ifdef _DIRENT_HAVE_D_RECLEN
-+ /* DIRENT_TYPE is of variable size, with d_name as its last entry. */
-+ size_t namelen;
-+# ifdef _DIRENT_HAVE_D_NAMLEN
-+ namelen = dp->d_namlen;
-+# else
-+ namelen = strlen (dp->d_name);
-+# endif
-+
-+ if (namelen <= NAME_MAX)
-+ *result = memcpy (entry, dp,
-+ offsetof (DIRENT_TYPE, d_name[0]) + namelen + 1);
-+ else
-+ {
-+ errno = EOVERFLOW;
-+ dp = NULL;
-+ *result = NULL;
-+ }
-+#else
-+ /* DIRENT_TYPE is of fixed size. */
- *result = memcpy (entry, dp, reclen);
--#ifdef GETDENTS_64BIT_ALIGNED
-- entry->d_reclen = reclen;
- #endif
- }
- else
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64 2013-11-23 08:17:36 UTC (rev 5785)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64 2013-11-23 11:13:41 UTC (rev 5786)
@@ -1,5 +1,4 @@
kfreebsd/local-memusage_no_mremap.diff
-#kfreebsd/local-readdir_r.diff
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386 2013-11-23 08:17:36 UTC (rev 5785)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386 2013-11-23 11:13:41 UTC (rev 5786)
@@ -1,5 +1,4 @@
kfreebsd/local-memusage_no_mremap.diff
-#kfreebsd/local-readdir_r.diff
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
Reply to: