diff --git a/util-linux-ng-bnc503008.patch b/util-linux-ng-bnc503008.patch new file mode 100644 index 0000000..1482097 --- /dev/null +++ b/util-linux-ng-bnc503008.patch @@ -0,0 +1,24 @@ +commit fdf08588af55d07a99b411708a08f4ebe6819706 +Author: Theodore Ts'o +Date: Sat Oct 3 12:50:06 2009 -0400 + + lib: fix file descriptor leak in is_mounted() + + Remove an extraneous fopen() that leaks memory and a file descriptor. + + Signed-off-by: "Theodore Ts'o" + +diff --git a/lib/ismounted.c b/lib/ismounted.c +index 28ae325..fbe91f9 100644 +--- a/lib/ismounted.c ++++ b/lib/ismounted.c +@@ -70,9 +70,6 @@ static int check_mntent_file(const char *mtab_file, const char *file, + char buf[1024], *device = 0, *mnt_dir = 0, *cp; + + *mount_flags = 0; +- if ((f = fopen(mtab_file, "r")) == NULL) +- return errno; +- + if ((f = setmntent (mtab_file, "r")) == NULL) + return errno; + if (stat(file, &st_buf) == 0) { diff --git a/util-linux.changes b/util-linux.changes index 820f4e0..cb4f923 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org + +- fsck during boot up fails with Too many open files [bnc#503008] + ------------------------------------------------------------------- Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de diff --git a/util-linux.spec b/util-linux.spec index 7f0c6f7..8324545 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -29,7 +29,7 @@ License: BSD 3-clause (or similar) ; GPL v2 or later Group: System/Base AutoReqProv: on Version: 2.16 -Release: 4 +Release: 5 Requires: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 @@ -68,6 +68,7 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-mount_losetup_crypto.patch +Patch4: util-linux-ng-bnc503008.patch ## ## adjtimex ## @@ -152,6 +153,7 @@ unique IDs (UUIDs). %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # cd adjtimex-* %patch50 -p1