Accepting request 62401 from home:mszeredi:branches:filesystems

OBS-URL: https://build.opensuse.org/request/show/62401
OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=20

fuse-fix-cleanup-in-case-of-failed-mount.patch

@@ -0,0 +1,16 @@
+---
+ util/fusermount.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+Index: fuse-2.7.2/util/fusermount.c
+===================================================================
+--- fuse-2.7.2.orig/util/fusermount.c	2011-02-21 17:30:34.000000000 +0100
++++ fuse-2.7.2/util/fusermount.c	2011-02-21 17:31:11.682067022 +0100
+@@ -770,7 +770,6 @@ static int mount_fuse(const char *mnt, c
+ 	if (geteuid() == 0) {
+ 		res = add_mount(source, mnt, type, mnt_opts);
+ 		if (res == -1) {
+-			umount2(mnt, 2); /* lazy umount */
+ 			close(fd);
+ 			return -1;
+ 		}

fuse.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 17 17:51:15 CET 2011 - mszeredi@suse.cz
+
+- In case of failure to add to /etc/mtab don't umount. [bnc#668820]
+  [CVE-2011-0541]
+
 -------------------------------------------------------------------
 Tue Nov 16 16:16:04 CET 2010 - mszeredi@suse.cz
 

fuse.spec

@@ -31,12 +31,13 @@ Source3:        baselibs.conf
 Patch:          fuse-install-fix.diff
 Patch2:         fuse-pc-remove-libdir-from-Libs.diff
 Patch3:         fuse-umount-race-fix.patch
+Patch4:         fuse-fix-cleanup-in-case-of-failed-mount.patch
 Url:            http://fuse.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1130
 Requires:       util-linux >= 2.18
 %else
-Requires:       util-linux
+Requires:       util-linux(fake+no-canonicalize)
 %endif
 Requires:       licenses
 BuildRequires:  licenses pkgconfig
@@ -227,6 +228,7 @@ Authors:
 %patch2
 %endif
 %patch3 -p1
+%patch4 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing"