[people/teissler/ipfire-2.x.git] / src / patches / util-linux-2.12a-umount_CAN-2005-2876.patch

# Fix borrowed from mandriva
# disable umount -r for non-root users to fix privilege escalation (CAN-2005-2876)

--- util-linux-2.12a/mount/umount.c.can-2005-2876	2005-09-19 20:18:32.011686865 -0600
+++ util-linux-2.12a/mount/umount.c	2005-09-19 20:19:02.699173130 -0600
@@ -695,7 +695,7 @@
 
 	if (getuid () != geteuid ()) {
 		suid = 1;
-		if (all || types || nomtab || force)
+		if (all || types || nomtab || force || remount)
 			die (2, _("umount: only root can do that"));
 	}
Commit	Line	Data
	1	# Fix borrowed from mandriva
	2	# disable umount -r for non-root users to fix privilege escalation (CAN-2005-2876)
	3
	4	--- util-linux-2.12a/mount/umount.c.can-2005-2876 2005-09-19 20:18:32.011686865 -0600
	5	+++ util-linux-2.12a/mount/umount.c 2005-09-19 20:19:02.699173130 -0600
	6	@@ -695,7 +695,7 @@
	7
	8	if (getuid () != geteuid ()) {
	9	suid = 1;
	10	- if (all \|\| types \|\| nomtab \|\| force)
	11	+ if (all \|\| types \|\| nomtab \|\| force \|\| remount)
	12	die (2, _("umount: only root can do that"));
	13	}
	14