Author: pfg
Date: Sun Feb 15 14:31:50 2015
New Revision: 278803
URL: https://svnweb.freebsd.org/changeset/base/278803
Log:
ulimit(3): Fix broken check.
The existing implementation had a broken comparison that could
overflow and return confusing values. Replace this with a check
that avoids the overflow before it happens.
Consistently return a maximum value also on the case of negative
arguments since negative is considered an overflow and means
infinity for our current setrlimit().
New revamped version is credited to Bruce Evans.
CID: 1199295
MFC after: 1 week
Modified:
head/lib/libc/gen/ulimit.c
Modified: head/lib/libc/gen/ulimit.c
==============================================================================
--- head/lib/libc/gen/ulimit.c Sun Feb 15 14:25:00 2015 (r278802)
+++ head/lib/libc/gen/ulimit.c Sun Feb 15 14:31:50 2015 (r278803)
@@ -33,6 +33,7 @@
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
+#include <stdint.h>
#include <ulimit.h>
long
@@ -40,6 +41,7 @@ ulimit(int cmd, ...)
{
struct rlimit limit;
va_list ap;
+ volatile intmax_t targ;
long arg;
if (cmd == UL_GETFSIZE) {
@@ -51,16 +53,18 @@ ulimit(int cmd, ...)
return ((long)limit.rlim_cur);
} else if (cmd == UL_SETFSIZE) {
va_start(ap, cmd);
- arg = va_arg(ap, long);
+ targ = arg = va_arg(ap, long);
va_end(ap);
- limit.rlim_max = limit.rlim_cur = (rlim_t)arg * 512;
+ if (targ < 0)
+ targ = LONG_MAX;
+ if (targ > RLIM_INFINITY / 512)
+ targ = RLIM_INFINITY / 512;
+ limit.rlim_max = limit.rlim_cur = targ * 512;
/* The setrlimit() function sets errno to EPERM if needed. */
if (setrlimit(RLIMIT_FSIZE, &limit) == -1)
return (-1);
- if (arg * 512 > LONG_MAX)
- return (LONG_MAX);
- return (arg);
+ return ((long)targ);
} else {
errno = EINVAL;
return (-1);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
