diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2004-02-05 18:01:26 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2004-02-05 18:01:26 +0000 |
| commit | 3a8a551a3591f41b50724b5af1d0d7bfea023cff (patch) | |
| tree | 69e5e0488f0432644fda305c7ce56c0846be7ded | |
| parent | 822cf828bd6d0149d13c672bffc584e0eb73c1c8 (diff) | |
| download | src-test2-3a8a551a3591f41b50724b5af1d0d7bfea023cff.tar.gz src-test2-3a8a551a3591f41b50724b5af1d0d7bfea023cff.zip | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/kern/sysv_shm.c | 1 |
3 files changed, 5 insertions, 1 deletions
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those updates that don't have an advisory, or to be safe, you can do a full build and install as described in the COMMON ITEMS section. +20040205: p25 FreeBSD-SA-04:02.shmat + Correct a reference counting bug in shmat(2). + 20040202: Fixed a syntax issue in gensetdefs(8) sources which tripped up newer compilers. This has no impact on security, but allows diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 22a05d9af7fa..33bf46869467 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.7" -BRANCH="RELEASE-p24" +BRANCH="RELEASE-p25" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 52c533b0feeb..f21d6ca47f18 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -312,6 +312,7 @@ shmat(p, uap) rv = vm_map_find(&p->p_vmspace->vm_map, shm_handle->shm_object, 0, &attach_va, size, (flags & MAP_FIXED)?0:1, prot, prot, 0); if (rv != KERN_SUCCESS) { + vm_object_deallocate(shm_handle->shm_object); return ENOMEM; } vm_map_inherit(&p->p_vmspace->vm_map, |