aboutsummaryrefslogtreecommitdiffstats
path: root/fs/select.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2010-03-05 16:42:42 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 14:26:29 -0500
commitd554ed895dc8f293cc712c71f14b101ace82579a (patch)
treefd29ba33d640e156e2ca4267ffbdb9dc566fd3d6 /fs/select.c
parent221e3ebf6d5f2625373573155924e39f196c5d3d (diff)
fs: use rlimit helpers
Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in commit 3e10e716abf3 ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/select.c')
-rw-r--r--fs/select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/select.c b/fs/select.c
index fd38ce2e32e3..73715e90030f 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -821,7 +821,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
821 struct poll_list *walk = head; 821 struct poll_list *walk = head;
822 unsigned long todo = nfds; 822 unsigned long todo = nfds;
823 823
824 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 824 if (nfds > rlimit(RLIMIT_NOFILE))
825 return -EINVAL; 825 return -EINVAL;
826 826
827 len = min_t(unsigned int, nfds, N_STACK_PPS); 827 len = min_t(unsigned int, nfds, N_STACK_PPS);