From: Dave Barach <dbarach@cisco.com>
Date: Tue, 10 Apr 2018 15:00:50 +0000 (-0400)
Subject: Clean up temp dir in failure cases
X-Git-Tag: v18.07-rc1~487
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9840ccada14f1c67b09323b5f4d96d2d7334a5cc;p=vpp.git

Clean up temp dir in failure cases

Change-Id: Icfb99a09726c01e96ff14967afbafa4116e02eff
Signed-off-by: Dave Barach <dbarach@cisco.com>
---

diff --git a/src/vppinfra/linux/mem.c b/src/vppinfra/linux/mem.c
index 475e3dcd747..d479da3f0cb 100644
--- a/src/vppinfra/linux/mem.c
+++ b/src/vppinfra/linux/mem.c
@@ -127,6 +127,7 @@ clib_mem_vm_ext_alloc (clib_mem_vm_alloc_t * a)
 
 	  if (mount ("none", (char *) mount_dir, "hugetlbfs", 0, NULL))
 	    {
+	      rmdir ((char *) mount_dir);
 	      err = clib_error_return_unix (0, "mount hugetlb directory '%s'",
 					    mount_dir);
 	      goto error;
@@ -136,6 +137,8 @@ clib_mem_vm_ext_alloc (clib_mem_vm_alloc_t * a)
 
 	  if ((fd = open ((char *) filename, O_CREAT | O_RDWR, 0755)) == -1)
 	    {
+	      umount2 ((char *) mount_dir, MNT_DETACH);
+	      rmdir ((char *) mount_dir);
 	      err = clib_error_return_unix (0, "open");
 	      goto error;
 	    }