Commit a4531edd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Fix up lost patch in compat_sys_select() for new RCU files world order 



Andrew lost this in patch reject resolution, and never noticed, since
the compat code isn't in use on x86.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1d8674ed

fs/compat.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {
@@ -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;