summaryrefslogtreecommitdiffstats
path: root/sys/kern/sysv_shm.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2003-01-07 00:34:41 +0000
committermillert <millert@openbsd.org>2003-01-07 00:34:41 +0000
commit4fd73715f7d573d32b52faba8fd59c6493887c7c (patch)
tree909a7001c5a8d8253e7ec6da2d8fce55135256e0 /sys/kern/sysv_shm.c
parentCorrect several typos in comments. No code changes. (diff)
downloadwireguard-openbsd-4fd73715f7d573d32b52faba8fd59c6493887c7c.tar.xz
wireguard-openbsd-4fd73715f7d573d32b52faba8fd59c6493887c7c.zip
xerxes [/home/src/local/millert/sudo/sudo-1.6.7] % vi /usr/src/local/TiVo/Linux/Don't allow s{e,h}mmni to be set > 0xffff via sysctl since that could
cause id collisions (the macros in <sys/ipc.h> limit the index to 0xffff). Prompted by a conversation with weingart@
Diffstat (limited to 'sys/kern/sysv_shm.c')
-rw-r--r--sys/kern/sysv_shm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 8f19a889d76..aaf85095b1a 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysv_shm.c,v 1.32 2003/01/06 20:11:28 millert Exp $ */
+/* $OpenBSD: sysv_shm.c,v 1.33 2003/01/07 00:34:41 millert Exp $ */
/* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */
/*
@@ -606,8 +606,8 @@ sysctl_sysvshm(int *name, u_int namelen, void *oldp, size_t *oldlenp,
val == shminfo.shmmni)
return (error);
- if (val < shminfo.shmmni)
- return (EINVAL); /* can't decrease shmmni */
+ if (val < shminfo.shmmni || val > 0xffff)
+ return (EINVAL);
/* Expand shmsegs and shmseqs arrays */
newsegs = malloc(val * sizeof(struct shmid_ds *),