[man-pages] resolves: #652869 fix the necessary buffer limit in the man page for readdir_r

Ivana Varekova varekova at fedoraproject.org
Thu Jan 27 14:12:33 UTC 2011


commit c967177abb031b9d4a63adc76f62a65bf4ddaabb
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date:   Thu Jan 27 16:14:02 2011 +0100

     resolves: #652869
     fix the necessary buffer limit in the man page for readdir_r

 man-pages-3.32-readdir.patch |   16 ++++++++++++++++
 man-pages.spec               |    9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/man-pages-3.32-readdir.patch b/man-pages-3.32-readdir.patch
new file mode 100644
index 0000000..137b853
--- /dev/null
+++ b/man-pages-3.32-readdir.patch
@@ -0,0 +1,16 @@
+diff -up man-pages-3.32/man3/readdir.3.pom man-pages-3.32/man3/readdir.3
+--- man-pages-3.32/man3/readdir.3.pom	2010-12-03 08:02:01.000000000 +0100
++++ man-pages-3.32/man3/readdir.3	2011-01-27 16:05:54.000000000 +0100
+@@ -226,8 +226,10 @@ as follows:
+ .in +4n
+ .nf
+ 
+-len = offsetof(struct dirent, d_name) +
+-          pathconf(dirpath, _PC_NAME_MAX) + 1
++len = (offsetof(struct dirent, d_name) +
++          pathconf(dirpath, _PC_NAME_MAX) + 1 + sizeof(long))
++          & -sizeof(long);
++          
+ entryp = malloc(len);
+ 
+ .fi
diff --git a/man-pages.spec b/man-pages.spec
index c55bdec..b7f91ea 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.32
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -36,6 +36,8 @@ Patch73: man-pages-posix-2003-printf.patch
 Patch75: man-pages-3.30-prctl.patch
 #Resolves: #652870
 Patch76: man-pages-3.32-strtol.patch
+#Resolves: #652869
+Patch77: man-pages-3.32-readdir.patch
 #Resolves: #655961
 Conflicts: quota < 3.17-14
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +74,7 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch73 -p1
 %patch75 -p1
 %patch76 -p1
+%patch77 -p1
 
 ### And now remove those we are not going to use:
 
@@ -127,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Thu Jan 27 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 3.31-6
+- resolves: #652869
+  fix the necessary buffer limit in the man page for readdir_r
+
 * Thu Jan 27 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 3.31-5
 - resolves: #672348
   problems with the encoding of characters set man-pages


More information about the scm-commits mailing list