Commit-ID: f044db4cb4bf16893812d35b5fbeaaf3e30c9215 Gitweb: http://git.kernel.org/tip/f044db4cb4bf16893812d35b5fbeaaf3e30c9215 Author: Bobby Powers <bobbypowers@xxxxxxxxx> AuthorDate: Wed, 22 Feb 2012 00:29:47 -0500 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Thu, 23 Feb 2012 18:28:52 -0800 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@xxxxxxxxx> Link: http://lkml.kernel.org/r/1329888587-3087-1-git-send-email-bobbypowers@xxxxxxxxx Acked-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> --- fs/file.c | 2 +- 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; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|