lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: close file descriptor leaks

Browse Source 
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>
This commit is contained in:
Jeff Dike
2006-09-29 01:58:51 -07:00
committed by Linus Torvalds
parent 730760e90a
commit 80c1374914
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/um/drivers/ubd_kern.c
View File

@@ -668,18 +668,15 @@ static int ubd_add(int n)
if(dev->file == NULL) if(dev->file == NULL)
goto out; goto out;
if (ubd_open_dev(dev))
goto out;
err = ubd_file_size(dev, &dev->size); err = ubd_file_size(dev, &dev->size);
if(err < 0) if(err < 0)
goto out_close; goto out;
dev->size = ROUND_BLOCK(dev->size); dev->size = ROUND_BLOCK(dev->size);
err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]); err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
if(err) if(err)
goto out_close; goto out;
if(fake_major != MAJOR_NR) if(fake_major != MAJOR_NR)
ubd_new_disk(fake_major, dev->size, n, 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); make_ide_entries(ubd_gendisk[n]->disk_name);
err = 0; err = 0;
out_close:
ubd_close(dev);
out: out:
return err; return err;
} }

6
arch/um/os-Linux/mem.c
View File

@@ -132,6 +132,9 @@ err:
else if(found < 0) else if(found < 0)
printf("read returned errno %d\n", -found); printf("read returned errno %d\n", -found);
out:
close(fd);
return; return;
found: found:
@@ -141,11 +144,12 @@ found:
if(strncmp(buf, "tmpfs", strlen("tmpfs"))){ if(strncmp(buf, "tmpfs", strlen("tmpfs"))){
printf("not tmpfs\n"); printf("not tmpfs\n");
return; goto out;
} }
printf("OK\n"); printf("OK\n");
default_tmpdir = "/dev/shm"; default_tmpdir = "/dev/shm";
goto out;
} }
/* /*