lkml.org 
[lkml]   [2008]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 2.6.27-rc5] Allow set RLIMIT_NOFILE to RLIM_INFINITY
Date
Adam Tkac <vonsch@gmail.com> writes:

> diff -puN kernel/sys.c~rlimit-permit-setting-rlimit_nofile-to-rlim_infinity kernel/sys.c
> --- a/kernel/sys.c~rlimit-permit-setting-rlimit_nofile-to-rlim_infinity
> +++ a/kernel/sys.c
> @@ -1532,8 +1532,14 @@ asmlinkage long sys_setrlimit(unsigned i
> if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
> !capable(CAP_SYS_RESOURCE))
> return -EPERM;
> - if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > sysctl_nr_open)
> - return -EPERM;
> + if (resource == RLIMIT_NOFILE) {
> + if (new_rlim.rlim_max == RLIM_INFINITY)
> + new_rlim.rlim_max = sysctl_nr_open;
> + if (new_rlim.rlim_cur == RLIM_INFINITY)
> + new_rlim.rlim_cur = sysctl_nr_open;
> + if (new_rlim.rlim_max > sysctl_nr_open)
> + return -EPERM;

This makes it possible to set cur > nr_open (when max = INF but nr_open
< cur < INF). You need to check that cur <= max after adjustment.

Andreas.

--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2008-09-12 13:23    [W:0.037 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site