summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Powers <bobbypowers@gmail.com>2012-02-22 00:29:47 -0500
committerH. Peter Anvin <hpa@zytor.com>2012-02-23 18:28:52 -0800
commitf044db4cb4bf16893812d35b5fbeaaf3e30c9215 (patch)
tree65d30aa0a19f6ff7db2be6fd1f1ac159ad1dc6f2
parentcf420048b3b2af9ce928d35cc5455c646c9dd2f7 (diff)
downloadop-kernel-dev-f044db4cb4bf16893812d35b5fbeaaf3e30c9215.zip
op-kernel-dev-f044db4cb4bf16893812d35b5fbeaaf3e30c9215.tar.gz
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 1fd36adc: 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>
-rw-r--r--fs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c
index 2d479dd..171f6b4 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -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;
OpenPOWER on IntegriCloud