summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDipankar Sarma <dipankar@in.ibm.com>2005-09-15 00:48:42 +0530
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 12:38:26 -0700
commit0b175a7e68c2f51555820efb0a01681e3419c1bc (patch)
tree6dc0dd21b9aaad86f6a94c594c7705ee5441c5aa
parentc7e43c78ae4d8630c418ce3495787b995e61a580 (diff)
downloadblackbird-op-linux-0b175a7e68c2f51555820efb0a01681e3419c1bc.tar.gz
blackbird-op-linux-0b175a7e68c2f51555820efb0a01681e3419c1bc.zip
[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>
-rw-r--r--fs/file.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/file.c b/fs/file.c
index 2127a7b9dc3a..fd066b261c75 100644
--- a/fs/file.c
+++ b/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);
}
OpenPOWER on IntegriCloud