diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2005-01-23 21:11:39 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2005-01-23 21:11:39 +0000 |
| commit | 471135a3af4efeeff21945c994d5723b05fcdc73 (patch) | |
| tree | 63dd37701c79a17118eaba4776b26aeff2951c38 /sys/kern/kern_prot.c | |
| parent | 0b880542e614e59733aa9223d0244800418f168a (diff) | |
Notes
Diffstat (limited to 'sys/kern/kern_prot.c')
| -rw-r--r-- | sys/kern/kern_prot.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 57216db3de32..38b904282ac1 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1275,10 +1275,9 @@ securelevel_gt(struct ucred *cr, int level) active_securelevel = securelevel; KASSERT(cr != NULL, ("securelevel_gt: null cr")); - if (cr->cr_prison != NULL) { + if (cr->cr_prison != NULL) active_securelevel = imax(cr->cr_prison->pr_securelevel, active_securelevel); - } return (active_securelevel > level ? EPERM : 0); } @@ -1289,10 +1288,9 @@ securelevel_ge(struct ucred *cr, int level) active_securelevel = securelevel; KASSERT(cr != NULL, ("securelevel_ge: null cr")); - if (cr->cr_prison != NULL) { + if (cr->cr_prison != NULL) active_securelevel = imax(cr->cr_prison->pr_securelevel, active_securelevel); - } return (active_securelevel >= level ? EPERM : 0); } |