diff options
| author | alc <alc@FreeBSD.org> | 1999-06-19 23:53:13 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 1999-06-19 23:53:13 +0000 |
| commit | a2a75e801547d1274266ab68c801be09dd364e5b (patch) | |
| tree | 38d6ee7fa86052643d26ef6a3f33a42d13a5b6a1 /sys/kern/sysv_shm.c | |
| parent | 3229eb479dd687d65e096f3a214bc8d15495b97e (diff) | |
| download | FreeBSD-src-a2a75e801547d1274266ab68c801be09dd364e5b.zip FreeBSD-src-a2a75e801547d1274266ab68c801be09dd364e5b.tar.gz | |
For consistency with other implementations, check for the existence
of the segment before checking its permissions.
PR: kern/11999
Submitted by: Brooks Davis <brooks@one-eyed-alien.net>
Diffstat (limited to 'sys/kern/sysv_shm.c')
| -rw-r--r-- | sys/kern/sysv_shm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 526af37..6371887 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.40 1999/01/21 08:29:04 dillon Exp $ */ +/* $Id: sysv_shm.c,v 1.41 1999/04/27 12:21:09 phk Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -441,13 +441,13 @@ shmget_existing(p, uap, mode, segnum) return error; return EAGAIN; } + if ((uap->shmflg & (IPC_CREAT | IPC_EXCL)) == (IPC_CREAT | IPC_EXCL)) + return EEXIST; error = ipcperm(p, &shmseg->shm_perm, mode); if (error) return error; if (uap->size && uap->size > shmseg->shm_segsz) return EINVAL; - if ((uap->shmflg & (IPC_CREAT | IPC_EXCL)) == (IPC_CREAT | IPC_EXCL)) - return EEXIST; p->p_retval[0] = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm); return 0; } |
