diff options
| author | ad <ad@NetBSD.org> | 2007-07-09 20:51:58 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2007-07-09 20:51:58 +0000 |
| commit | 88ab7da936c561aba9ff7492617ffb08f8d08ece (patch) | |
| tree | d9d78b17ff651178241606f2e7766abdd0f15137 /sys/secmodel | |
| parent | 317bac119f13240650ea6882854b381cf1024fa1 (diff) | |
Merge some of the less invasive changes from the vmlocking branch:
- kthread, callout, devsw API changes
- select()/poll() improvements
- miscellaneous MT safety improvements
Diffstat (limited to 'sys/secmodel')
| -rw-r--r-- | sys/secmodel/bsd44/secmodel_bsd44_securelevel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/secmodel/bsd44/secmodel_bsd44_securelevel.c b/sys/secmodel/bsd44/secmodel_bsd44_securelevel.c index 05e4d76af60..fd0a0614295 100644 --- a/sys/secmodel/bsd44/secmodel_bsd44_securelevel.c +++ b/sys/secmodel/bsd44/secmodel_bsd44_securelevel.c @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_bsd44_securelevel.c,v 1.29 2007/01/10 11:20:21 elad Exp $ */ +/* $NetBSD: secmodel_bsd44_securelevel.c,v 1.30 2007/07/09 21:11:31 ad Exp $ */ /*- * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org> * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44_securelevel.c,v 1.29 2007/01/10 11:20:21 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44_securelevel.c,v 1.30 2007/07/09 21:11:31 ad Exp $"); #ifdef _KERNEL_OPT #include "opt_insecure.h" @@ -481,7 +481,8 @@ secmodel_bsd44_securelevel_device_cb(kauth_cred_t cred, if (blkdev != NODEV) { vfinddev(blkdev, VBLK, &bvp); if (bvp != NULL) - d_type = cdev->d_type; + d_type = (cdev->d_flag + & D_TYPEMASK); } } @@ -492,7 +493,7 @@ secmodel_bsd44_securelevel_device_cb(kauth_cred_t cred, bdev = bdevsw_lookup(dev); if (bdev != NULL) - d_type = bdev->d_type; + d_type = (bdev->d_flag & D_TYPEMASK); bvp = vp; |
