[patch] Fix the double-free issue

util-linux-2.19.1-fix-doublefree-mount_opts.patch (text/plain), 861 bytes, created by Sven Vermeulen on 2011-07-24 10:01:56 UTC

--- util-linux-2.19.1/mount/mount.c.orig	2011-07-24 11:51:30.269995150 +0200
+++ util-linux-2.19.1/mount/mount.c	2011-07-24 11:51:32.790994902 +0200
@@ -1600,8 +1600,16 @@
        */
       security_context_t sc = NULL;
 
-      if (getfilecon(node, &sc) > 0 && strcmp("unlabeled", sc))
-	      append_context("rootcontext=", (char *) sc, &mount_opts);
+      if (getfilecon(node, &sc) > 0 && strcmp("unlabeled", sc)) {
+            append_context("rootcontext=", (char *) sc, &mount_opts);
+            /* append_context calls xstrconcat4 which might free its first 
+             * argument, which is &mount_opts here. However, mount_opts is
+             * pointed to by extra_opts(1) as well, so we need to reset those
+             */
+            extra_opts = mount_opts;
+            extra_opts1 = mount_opts;
+      }
+
       freecon(sc);
   }
 #endif