Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80c13749 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[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: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 730760e9

arch/um/drivers/ubd_kern.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

}

arch/um/os-Linux/mem.c

+5 −1
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ static void which_tmpdir(void) 
	else if(found < 0)

		printf("read returned errno %d\n", -found);



out:

	close(fd);



	return;



found:
@@ -141,11 +144,12 @@ static void which_tmpdir(void) 


	if(strncmp(buf, "tmpfs", strlen("tmpfs"))){

		printf("not tmpfs\n");

		return;

		goto out;

	}



	printf("OK\n");

	default_tmpdir = "/dev/shm";

	goto out;

}



/*