Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fd_copy: fix off-by-one bug in a race condition path and assert.

Browse Source 
Should fix PR/40625.  OK by <ad>.
This commit is contained in:
rmind 2009-03-02 19:28:08 +00:00
parent 0283f9fff8
commit 4bd0e7cebc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_descrip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_descrip.c,v 1.185 2008/12/21 09:58:22 ad Exp $ */
/* $NetBSD: kern_descrip.c,v 1.186 2009/03/02 19:28:08 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.185 2008/12/21 09:58:22 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.186 2009/03/02 19:28:08 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1284,7 +1284,7 @@ fd_copy(void)
i /= 2;
}
newfdp->fd_ofiles = fd_ofile_alloc(i);
KASSERT(i >= NDFILE);
KASSERT(i > NDFILE);
}
if (NDHISLOTS(i) <= NDHISLOTS(NDFILE)) {
newfdp->fd_himap = newfdp->fd_dhimap;
@ -1313,7 +1313,7 @@ fd_copy(void)
break;
}
mutex_exit(&fdp->fd_lock);
if (i >= NDFILE) {
if (i > NDFILE) {
fd_ofile_free(i, newfdp->fd_ofiles);
}
if (NDHISLOTS(i) > NDHISLOTS(NDFILE)) {