Permalink
Browse files

fs: Fix close_on_exec pointer in alloc_fdtable

alloc_fdtable allocates space for the open_fds and close_on_exec
bitfields together, as 2 * nr / BITS_PER_BYTE.  close_on_exec needs to
point to open_fds + nr / BITS_PER_BYTE, not open_fds + nr /
BITS_PER_LONG, as introducted in 1fd36ad: Replace the fd_sets in
struct fdtable with an array of unsigned longs.

Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
Link: http://lkml.kernel.org/r/1329888587-3087-1-git-send-email-bobbypowers@gmail.com
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information...
1 parent cf42004 commit f044db4cb4bf16893812d35b5fbeaaf3e30c9215 @bpowers bpowers committed with H. Peter Anvin Feb 22, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 fs/file.c
View
@@ -179,7 +179,7 @@ static struct fdtable * alloc_fdtable(unsigned int nr)
if (!data)
goto out_arr;
fdt->open_fds = data;
- data += nr / BITS_PER_LONG;
+ data += nr / BITS_PER_BYTE;
fdt->close_on_exec = data;
fdt->next = NULL;

0 comments on commit f044db4

Please sign in to comment.