[PATCH] uml: close file descriptor leaks

Close two file descriptor leaks, one in the ubd driver and one to
/proc/mounts.  The ubd driver bug also leaked some vmalloc space.  The
/proc/mounts leak was a descriptor that was just never closed.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 7 insertions, 8 deletions

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 34085315aa57..5fa4c8e258a4 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -668,18 +668,15 @@ static int ubd_add(int n)
         if(dev->file == NULL)
                 goto out;
 
-        if (ubd_open_dev(dev))
-                goto out;
-
         err = ubd_file_size(dev, &dev->size);
         if(err < 0)
-                goto out_close;
+                goto out;
 
         dev->size = ROUND_BLOCK(dev->size);
 
         err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
         if(err)
-                goto out_close;
+                goto out;
 
         if(fake_major != MAJOR_NR)
                 ubd_new_disk(fake_major, dev->size, n,
@@ -691,8 +688,6 @@ static int ubd_add(int n)
                 make_ide_entries(ubd_gendisk[n]->disk_name);
 
         err = 0;
-out_close:
-        ubd_close(dev);
 out:
         return err;
 }
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index b170b4704dc4..4203681e508d 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -132,6 +132,9 @@ err:
         else if(found < 0)
                 printf("read returned errno %d\n", -found);
 
+out:
+        close(fd);
+
         return;
 
 found:
@@ -141,11 +144,12 @@ found:
 
         if(strncmp(buf, "tmpfs", strlen("tmpfs"))){
                 printf("not tmpfs\n");
-                return;
+                goto out;
         }
 
         printf("OK\n");
         default_tmpdir = "/dev/shm";
+        goto out;
 }
 
 /*