diff --git a/util-linux-2.13-loop.patch b/util-linux-2.13-loop.patch new file mode 100644 index 0000000..ca5698c --- /dev/null +++ b/util-linux-2.13-loop.patch @@ -0,0 +1,32 @@ +--- util-linux-ng-2.13rc2+git20070725/mount/lomount.c.org 2007-08-16 17:09:33.258902000 +0200 ++++ util-linux-ng-2.13rc2+git20070725/mount/lomount.c 2007-08-16 17:09:43.016135000 +0200 +@@ -398,6 +398,7 @@ + } + if (ioctl (fd, LOOP_CLR_FD, 0) < 0) { + perror ("ioctl: LOOP_CLR_FD"); ++ close(fd); + return 1; + } + close (fd); +--- util-linux-ng-2.13rc2+git20070725/mount/fsprobe_volumeid.c.org 2007-08-16 18:16:03.120065000 +0200 ++++ util-linux-ng-2.13rc2+git20070725/mount/fsprobe_volumeid.c 2007-08-16 18:27:43.967526000 +0200 +@@ -34,8 +34,10 @@ + return NULL; + + id = volume_id_open_fd(fd); +- if (!id) ++ if (!id) { ++ close(fd); + return NULL; ++ } + + /* TODO: use blkdev_get_size() */ + if (ioctl(fd, BLKGETSIZE64, &size) != 0) +@@ -61,6 +63,7 @@ + } + + volume_id_close(id); ++ close(fd); + return value; + } + diff --git a/util-linux.changes b/util-linux.changes index d2ca0cc..bf017e4 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 16 18:34:30 CEST 2007 - ssommer@suse.de + +- free loop devices when mount fails [#297172] + ------------------------------------------------------------------- Wed Jul 25 18:43:42 CEST 2007 - mkoenig@suse.de diff --git a/util-linux.spec b/util-linux.spec index 3fe37cb..8c59804 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -21,7 +21,7 @@ License: BSD 3-Clause, GPL v2 or later Group: System/Base Autoreqprov: on Version: 2.12r+2.13rc2+git20070725 -Release: 1 +Release: 8 %define upver 2.13rc2+git20070725 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2 @@ -67,6 +67,8 @@ Patch35: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch # suse48633 - util-linux on x86_64 does not contain "rdev" and "vidmode" Patch45: util-linux-2.13-sys_utils_build_rdev_x86_64.patch +# 297172 - mount does not free loop devices if it fails +Patch46: util-linux-2.13-loop.patch ## ## adjtimex ## @@ -110,7 +112,7 @@ Authors: %patch35 -p1 #%patch38 -p1 %patch45 -p1 -#%patch46 -p1 +%patch46 -p1 # cd adjtimex-* %patch50 -p1 @@ -551,6 +553,8 @@ fi #%endif %changelog +* Thu Aug 16 2007 - ssommer@suse.de +- free loop devices when mount fails [#297172] * Wed Jul 25 2007 - mkoenig@suse.de - update to git20070725 - removed patches (merged upstream):