[PATCH] Fix the fdtable freeing in the case of vmalloced fdset/arrays
Noted by David Miller: "The bug is that free_fd_array() takes a "num" argument, but when calling it from __free_fdtable() we're instead passing in the size in bytes (ie. "num * sizeof(struct file *)")." Yes it is a bug. I think I messed it up while merging newer changes with an older version where I was using size in bytes to optimize. Signed-off-by: Dipankar Sarma <dipankar@in.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
c7e43c78ae
commit
0b175a7e68
10
fs/file.c
10
fs/file.c
|
@ -69,13 +69,9 @@ void free_fd_array(struct file **array, int num)
|
|||
|
||||
static void __free_fdtable(struct fdtable *fdt)
|
||||
{
|
||||
int fdset_size, fdarray_size;
|
||||
|
||||
fdset_size = fdt->max_fdset / 8;
|
||||
fdarray_size = fdt->max_fds * sizeof(struct file *);
|
||||
free_fdset(fdt->open_fds, fdset_size);
|
||||
free_fdset(fdt->close_on_exec, fdset_size);
|
||||
free_fd_array(fdt->fd, fdarray_size);
|
||||
free_fdset(fdt->open_fds, fdt->max_fdset);
|
||||
free_fdset(fdt->close_on_exec, fdt->max_fdset);
|
||||
free_fd_array(fdt->fd, fdt->max_fds);
|
||||
kfree(fdt);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue