diff options
| author |   dhartmei <dhartmei@openbsd.org> | 2002-02-25 04:53:16 +0000 |
|---|---|---|
| committer | dhartmei <dhartmei@openbsd.org> | 2002-02-25 04:53:16 +0000 |
| commit | 9ede0f6db9da186f816a36a474cb4a995ec8042c (patch) | |
| tree | 5b860c6f341b2a9fdeb3c1e62269d59cf6eb63b3 /sys/kern/subr_pool.c | |
| parent | use mktemp, don't bother with creating a directory when only one tmp file is (diff) | |
| download | wireguard-openbsd-9ede0f6db9da186f816a36a474cb4a995ec8042c.tar.xz wireguard-openbsd-9ede0f6db9da186f816a36a474cb4a995ec8042c.zip | |
Make pool_sethardlimit() check that it doesn't decrease the limit below
the current size of the pool. ok art@
Diffstat (limited to 'sys/kern/subr_pool.c')
| -rw-r--r-- | sys/kern/subr_pool.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index e9ea1657039..d6cb4495ad6 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.27 2002/02/23 02:52:56 art Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.28 2002/02/25 04:53:16 dhartmei Exp $ */ /* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */ /*- @@ -1217,12 +1217,18 @@ pool_sethiwat(struct pool *pp, int n) simple_unlock(&pp->pr_slock); } -void -pool_sethardlimit(struct pool *pp, int n, const char *warnmess, int ratecap) +int +pool_sethardlimit(struct pool *pp, unsigned n, const char *warnmess, int ratecap) { + int error = 0; simple_lock(&pp->pr_slock); + if (n < pp->pr_nout) { + error = EINVAL; + goto done; + } + pp->pr_hardlimit = n; pp->pr_hardlimit_warning = warnmess; pp->pr_hardlimit_ratecap.tv_sec = ratecap; @@ -1233,11 +1239,14 @@ pool_sethardlimit(struct pool *pp, int n, const char *warnmess, int ratecap) * In-line version of pool_sethiwat(), because we don't want to * release the lock. */ - pp->pr_maxpages = (n == 0) - ? 0 + pp->pr_maxpages = (n == 0 || n == UINT_MAX) + ? n : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; + done: simple_unlock(&pp->pr_slock); + + return (error); } /* |