Fix CVE-2011-1749: Anticipate RLIMIT_FSIZE (Closes: #629420)

diff --git a/debian/changelog b/debian/changelog
index 8535010108f33a474acbb156e5f9656052556cf2..491b6d37cfa557aaf009a6d1780278706d530ca3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nfs-utils (1:1.2.3-3) UNRELEASED; urgency=low
   * Remove very old versioned dependencies on netbase and libblkid1
   * Exclude state files from dh_md5sum
   * Use rpcinfo instead of /dev/tcp redirection
+  * Fix CVE-2011-1749: Anticipate RLIMIT_FSIZE (Closes: #629420)
 
   [ Ben Hutchings ]
   * statd.man, nfsiostat.man: Fix syntax errors, thanks to Simon Paillard
@@ -13,7 +14,7 @@ nfs-utils (1:1.2.3-3) UNRELEASED; urgency=low
   * exports.man: Fix syntax errors
   * nfs.man: Fix syntax errors and improve tabulation
 
- -- Luk Claes <luk@debian.org>  Wed, 13 Apr 2011 22:54:50 +0200
+ -- Luk Claes <luk@debian.org>  Tue, 07 Jun 2011 12:13:29 +0200
 
 nfs-utils (1:1.2.3-2) unstable; urgency=low
 

diff --git a/debian/patches/21-anticipate-RLIMIT_FSIZE.patch b/debian/patches/21-anticipate-RLIMIT_FSIZE.patch
new file mode 100644 (file)
index 0000000..d2201d5
--- /dev/null
+++ b/debian/patches/21-anticipate-RLIMIT_FSIZE.patch
@@ -0,0 +1,17 @@
+Index: nfs-utils/support/nfs/nfs_mntent.c
+===================================================================
+--- nfs-utils.orig/support/nfs/nfs_mntent.c    2011-06-07 12:08:56.000000000 +0200
++++ nfs-utils/support/nfs/nfs_mntent.c 2011-06-07 12:11:32.000000000 +0200
+@@ -143,7 +143,11 @@
+       free(m2);
+       free(m3);
+       free(m4);
+-      return (res < 0) ? 1 : 0;
++      if (res < 0)
++              return 1;
++      else {
++              return (fflush(mfp->mntent_fp) == 0) ? 0 : 1;
++      }
+ }
+ 
+ /* Read the next entry from the file fp. Stop reading at an incorrect entry. */

diff --git a/debian/patches/series b/debian/patches/series
index 8057a7095c501d27ae7775a92276403e726df9c8..309daef152bf0f5b185bdc7d794a0871e687d82f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 18-Fix-nfsiostat.8-manpage-syntax-missing-.I.patch
 19-exports.man-Fix-comment-syntax.patch
 20-nfs.man-Fix-fstab-example.patch
+21-anticipate-RLIMIT_FSIZE.patch