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

Fix a NULL pointer dereference after a loooong discussion with dholland@,

Browse Source 
hannken@, blymn@ and martin@.

This bug would panic the system when veriexec is set to the VERIEXEC_LOCKDOWN
mode (only settable from root).
This commit is contained in:
maxv 2014-06-22 18:32:27 +00:00
parent 742b1eee79
commit 54e39d64d0
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/kern/vfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_vnops.c,v 1.189 2014/02/27 16:51:38 hannken Exp $ */ /* $NetBSD: vfs_vnops.c,v 1.190 2014/06/22 18:32:27 maxv Exp $ */
/*- /*-
* Copyright (c) 2009 The NetBSD Foundation, Inc. * Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.189 2014/02/27 16:51:38 hannken Exp $"); __KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.190 2014/06/22 18:32:27 maxv Exp $");
#include "veriexec.h" #include "veriexec.h"
@ -171,8 +171,25 @@ vn_open(struct nameidata *ndp, int fmode, int cmode)
#if NVERIEXEC > 0 #if NVERIEXEC > 0
error = veriexec_openchk(l, ndp->ni_vp, pathstring, fmode); error = veriexec_openchk(l, ndp->ni_vp, pathstring, fmode);
if (error) if (error) {
goto bad; /* We have to release the locks ourselves */
if (fmode & O_CREAT) {
if (vp == NULL) {
vput(ndp->ni_dvp);
} else {
VOP_ABORTOP(ndp->ni_dvp, &ndp->ni_cnd);
if (ndp->ni_dvp == ndp->ni_vp)
vrele(ndp->ni_dvp);
else
vput(ndp->ni_dvp);
ndp->ni_dvp = NULL;
vput(vp);
}
} else {
vput(vp);
}
goto out;
}
#endif /* NVERIEXEC > 0 */ #endif /* NVERIEXEC > 0 */
if (fmode & O_CREAT) { if (fmode & O_CREAT) {