diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-01-09 18:10:14 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-01-09 18:10:14 +0300 |
| commit | e3786825c0ccb9c8117db88bdd21cdc61800c617 (patch) | |
| tree | 89115677e1ab4c819c0ca8aa4642ec2c1a02f4f7 /winsup/cygserver | |
| parent | 104fffd24dbf116e320773d5fc816097f4d0e38e (diff) | |
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')
| -rw-r--r-- | winsup/cygserver/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygserver/sysv_msg.cc | 1 | ||||
| -rw-r--r-- | winsup/cygserver/sysv_sem.cc | 3 | ||||
| -rw-r--r-- | winsup/cygserver/sysv_shm.cc | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index bee49e054..1a13f20e0 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,3 +1,10 @@ +2006-01-09 Corinna Vinschen <corinna@vinschen.de> + + 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). + 2005-11-10 Corinna Vinschen <corinna@vinschen.de> * bsd_helper.cc (securityinit): New function. Move initialization diff --git a/winsup/cygserver/sysv_msg.cc b/winsup/cygserver/sysv_msg.cc index 90ea95325..5ad3b659b 100644 --- a/winsup/cygserver/sysv_msg.cc +++ b/winsup/cygserver/sysv_msg.cc @@ -28,6 +28,7 @@ #define __FBSDID(s) const char version[] = (s) #endif __FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/kern/sysv_msg.c,v 1.52 2003/11/07 04:47:14 rwatson Exp $"); +/* CV, 2006-01-09: Inspected upstream up to version 1.60. */ #define _KERNEL 1 #define __BSD_VISIBLE 1 diff --git a/winsup/cygserver/sysv_sem.cc b/winsup/cygserver/sysv_sem.cc index ee1bda856..bee24abbd 100644 --- a/winsup/cygserver/sysv_sem.cc +++ b/winsup/cygserver/sysv_sem.cc @@ -18,6 +18,7 @@ #define __FBSDID(s) const char version[] = (s) #endif __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/kern/sysv_sem.c,v 1.70 2004/05/30 20:34:58 phk Exp $"); +/* CV, 2006-01-09: Inspected upstream up to version 1.78. */ #define _KERNEL 1 #define __BSD_VISIBLE 1 @@ -806,7 +807,7 @@ raced: if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0) goto done2; array = (u_short *) sys_malloc(sizeof(*array) * count, M_TEMP, M_WAITOK); - copyin(real_arg.array, array, count * sizeof(*array)); + error = copyin(real_arg.array, array, count * sizeof(*array)); if (error) break; mtx_lock(sema_mtxp); 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; } |