mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Chris Snook" <csnook@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: willy@w.ods.org
Subject: [PATCH 2.4.33.2] enforce RLIMIT_NOFILE in poll()
Date: Thu, 31 Aug 2006 21:06:55 -0400	[thread overview]
Message-ID: <20060901.PbR.07536400@egw.corp.redhat.com> (raw)

From: Chris Snook <csnook@redhat.com>

POSIX states that poll() shall fail with EINVAL if nfds > OPEN_MAX.  In this
context, POSIX is referring to sysconf(OPEN_MAX), which is the value of
current->rlim[RLIMIT_NOFILE].rlim_cur, not the compile-time constant which
happens to be named OPEN_MAX.  The current code will permit polling up to 1024
file descriptors even if RLIMIT_NOFILE is less than 1024, which POSIX forbids.
 The current code also breaks polling greater than 1024 file descriptors if
the process has less than 1024 valid descriptors, even if RLIMIT_NOFILE >
1024.  While it is silly to poll duplicate or invalid file descriptors, POSIX
permits this, and it worked circa 2.4.18, and currently works up to 1024.
This patch directly checks the RLIMIT_NOFILE value, and permits exactly what
POSIX suggests, no more, no less.

Signed-off-by: Chris Snook <csnook@redhat.com>
---

diff -urNp linux-2.4.33.2-orig/fs/select.c linux-2.4.33.2-patch/fs/select.c
--- linux-2.4.33.2-orig/fs/select.c	2006-08-22 16:13:54.000000000 -0400
+++ linux-2.4.33.2-patch/fs/select.c	2006-08-31 13:43:39.000000000 -0400
@@ -417,7 +417,7 @@ asmlinkage long sys_poll(struct pollfd *
 	int nchunks, nleft;

 	/* Do a sanity check on nfds ... */
-	if (nfds > current->files->max_fdset && nfds > OPEN_MAX)
+	if (nfds > current->rlim[RLIMIT_NOFILE].rlim_cur)
 		return -EINVAL;

 	if (timeout) {


             reply	other threads:[~2006-09-01  1:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-09-01  1:06 Chris Snook [this message]
2006-09-01  3:48 ` Willy Tarreau
2006-09-01  4:25   ` Vadim Lobanov
2006-09-01  6:08     ` Chris Snook
2006-09-01 16:03     ` Chris Snook
2006-09-01 19:31       ` Willy Tarreau
2006-09-01 21:24         ` Chris Snook
2006-09-01 20:04           ` Willy Tarreau

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=20060901.PbR.07536400@egw.corp.redhat.com \
    --to=csnook@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=willy@w.ods.org \
    /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

Powered by JetHome