Merge pull request #1548 from brauner/2017-05-10/prevent_umount_propagation

utils: handle > 2^31 in lxc_unstack_mountpoint()

Merge pull request #1548 from brauner/2017-05-10/prevent_umount_propagation
394c2205 · Stéphane Graber · GitHub · 60883ba8 · b4a40f7b · 394c2205
Commit 394c2205 authored May 10, 2017 by Stéphane Graber Committed by GitHub May 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

utils.c src/lxc/utils.c +6 -1

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -2221,10 +2221,15 @@ pop_stack:
 		if (errno != EINVAL)
 			return -errno;
 	} else {
+		/* Just stop counting when this happens. That'd just be so
+		 * stupid that we won't even bother trying to report back the
+		 * correct value anymore.
+		 */
+		if (umounts != INT_MAX)
+			umounts++;
 		/* We succeeded in umounting. Make sure that there's no other
 		 * mountpoint stacked underneath.
 		 */
-		umounts++;
 		goto pop_stack;
 	}