projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.34-rc1' into for-2.6.35
[firefly-linux-kernel-4.4.55.git]
/
fs
/
select.c
diff --git
a/fs/select.c
b/fs/select.c
index fd38ce2e32e349ba3c418dbc454957dd0e3ad958..73715e90030f0c78059c98c6a4e0abf6b8a04ffa 100644
(file)
--- a/
fs/select.c
+++ b/
fs/select.c
@@
-821,7
+821,7
@@
int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
struct poll_list *walk = head;
unsigned long todo = nfds;
struct poll_list *walk = head;
unsigned long todo = nfds;
- if (nfds >
current->signal->rlim[RLIMIT_NOFILE].rlim_cur
)
+ if (nfds >
rlimit(RLIMIT_NOFILE)
)
return -EINVAL;
len = min_t(unsigned int, nfds, N_STACK_PPS);
return -EINVAL;
len = min_t(unsigned int, nfds, N_STACK_PPS);