mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-20 10:16:34 +01:00
The values for setrlimit in the data size and stack size case are
used as an address value. Then all comparisons should be done unsigned and not signed. Fix it with a typecast of u_quad_t. Error can be demonstrated with the current bash in port, do a ulimit -s unlimited and the machine hangs. bash delivers through an internal error a large negative value for the stacksize, the comparison saw this smaller than MAXSSIZ and then tried to expand the stack to this size.
This commit is contained in:
parent
bb7cc11ad5
commit
a7d72265c4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=4889
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)kern_resource.c 8.5 (Berkeley) 1/21/94
|
||||
* $Id: kern_resource.c,v 1.6 1994/10/02 04:45:49 davidg Exp $
|
||||
* $Id: kern_resource.c,v 1.7 1994/10/10 01:00:46 phk Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -362,16 +362,16 @@ dosetrlimit(p, which, limp)
|
||||
switch (which) {
|
||||
|
||||
case RLIMIT_DATA:
|
||||
if (limp->rlim_cur > MAXDSIZ)
|
||||
if ((u_quad_t) limp->rlim_cur > MAXDSIZ)
|
||||
limp->rlim_cur = MAXDSIZ;
|
||||
if (limp->rlim_max > MAXDSIZ)
|
||||
if ((u_quad_t) limp->rlim_max > MAXDSIZ)
|
||||
limp->rlim_max = MAXDSIZ;
|
||||
break;
|
||||
|
||||
case RLIMIT_STACK:
|
||||
if (limp->rlim_cur > MAXSSIZ)
|
||||
if ((u_quad_t) limp->rlim_cur > MAXSSIZ)
|
||||
limp->rlim_cur = MAXSSIZ;
|
||||
if (limp->rlim_max > MAXSSIZ)
|
||||
if ((u_quad_t) limp->rlim_max > MAXSSIZ)
|
||||
limp->rlim_max = MAXSSIZ;
|
||||
/*
|
||||
* Stack is allocated to the max at exec time with only
|
||||
@ -383,7 +383,7 @@ dosetrlimit(p, which, limp)
|
||||
vm_size_t size;
|
||||
vm_prot_t prot;
|
||||
|
||||
if (limp->rlim_cur > alimp->rlim_cur) {
|
||||
if ((u_quad_t) limp->rlim_cur > alimp->rlim_cur) {
|
||||
prot = VM_PROT_ALL;
|
||||
size = limp->rlim_cur - alimp->rlim_cur;
|
||||
addr = USRSTACK - limp->rlim_cur;
|
||||
|
Loading…
Reference in New Issue
Block a user