linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Bobby Powers <bobbypowers@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, bobbypowers@gmail.com,
	hpa@zytor.com, mingo@redhat.com, dhowells@redhat.com,
	tglx@linutronix.de
Subject: [tip:core/types] fs: Fix close_on_exec pointer in alloc_fdtable
Date: Thu, 23 Feb 2012 18:42:58 -0800	[thread overview]
Message-ID: <tip-f044db4cb4bf16893812d35b5fbeaaf3e30c9215@git.kernel.org> (raw)
In-Reply-To: <1329888587-3087-1-git-send-email-bobbypowers@gmail.com>

Commit-ID:  f044db4cb4bf16893812d35b5fbeaaf3e30c9215
Gitweb:     http://git.kernel.org/tip/f044db4cb4bf16893812d35b5fbeaaf3e30c9215
Author:     Bobby Powers <bobbypowers@gmail.com>
AuthorDate: Wed, 22 Feb 2012 00:29:47 -0500
Committer:  H. Peter Anvin <hpa@zytor.com>
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@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>
---
 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;
 

      parent reply	other threads:[~2012-02-24  2:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-22  5:29 [PATCH tip/x86/x32] fs: fix close_on_exec pointer in alloc_fdtable Bobby Powers
2012-02-22 10:18 ` David Howells
2012-02-23 14:40   ` Bobby Powers
2012-02-23 14:56     ` H. Peter Anvin
2012-02-24  2:42 ` tip-bot for Bobby Powers [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-f044db4cb4bf16893812d35b5fbeaaf3e30c9215@git.kernel.org \
    --to=bobbypowers@gmail.com \
    --cc=dhowells@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).