diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-01-09 15:10:14 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-01-09 15:10:14 +0000 |
| commit | e3786825c0ccb9c8117db88bdd21cdc61800c617 (patch) | |
| tree | 89115677e1ab4c819c0ca8aa4642ec2c1a02f4f7 /winsup/cygserver/sysv_shm.cc | |
| parent | 104fffd24dbf116e320773d5fc816097f4d0e38e (diff) | |
| download | cygnal-e3786825c0ccb9c8117db88bdd21cdc61800c617.tar.gz cygnal-e3786825c0ccb9c8117db88bdd21cdc61800c617.tar.bz2 cygnal-e3786825c0ccb9c8117db88bdd21cdc61800c617.zip | |
Check FreeBSD upstream changes and apply important patches.
* sysv_sem.cc (__semctl): Check copyin return value (from 1.76).
* sysv_shm.cc (shminit): Actually use the iterating variable in the
for loop when trying to avoid overflow (from 1.102).
Diffstat (limited to 'winsup/cygserver/sysv_shm.cc')
| -rw-r--r-- | winsup/cygserver/sysv_shm.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygserver/sysv_shm.cc b/winsup/cygserver/sysv_shm.cc index 2b6758755..c3cf730e7 100644 --- a/winsup/cygserver/sysv_shm.cc +++ b/winsup/cygserver/sysv_shm.cc @@ -40,6 +40,7 @@ #define __FBSDID(s) const char version[] = (s) #endif __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/kern/sysv_shm.c,v 1.89 2003/11/07 04:47:14 rwatson Exp $"); +/* CV, 2006-01-09: Inspected upstream up to version 1.104. */ #define _KERNEL 1 #define __BSD_VISIBLE 1 @@ -954,7 +955,7 @@ shminit(void) TUNABLE_INT_FETCH("kern.ipc.shmmaxpgs", &shminfo.shmall); for (i = PAGE_SIZE; i > 0; i--) { - shminfo.shmmax = shminfo.shmall * PAGE_SIZE; + shminfo.shmmax = shminfo.shmall * i; if (shminfo.shmmax >= shminfo.shmall) break; } |