Skip to content

Commit

Permalink
Fix up lost patch in compat_sys_select() for new RCU files world order
Browse files Browse the repository at this point in the history
Andrew lost this in patch reject resolution, and never noticed, since
the compat code isn't in use on x86.

Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Linus Torvalds committed Sep 9, 2005
1 parent 1d8674e commit a4531ed
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion fs/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1619,6 +1619,7 @@ compat_sys_select(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp
char *bits;
long timeout;
int size, max_fdset, ret = -EINVAL;
struct fdtable *fdt;

timeout = MAX_SCHEDULE_TIMEOUT;
if (tvp) {
Expand All @@ -1644,7 +1645,8 @@ compat_sys_select(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp
goto out_nofds;

/* max_fdset can increase, so grab it once to avoid race */
max_fdset = current->files->max_fdset;
fdt = files_fdtable(current->files);
max_fdset = fdt->max_fdset;
if (n > max_fdset)
n = max_fdset;

Expand Down

0 comments on commit a4531ed

Please sign in to comment.