d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Axe a stale comment. We haven't allowed the ucred pointer passed to

Browse Source 
securelevel_*() to be NULL for a while now.
- Use KASSERT() instead of if (foo) panic(); to optimize the
  !INVARIANTS case.

Submitted by:	Martin Faxer <gmh003532@brfmasthugget.se>
This commit is contained in:
John Baldwin 2002-04-03 18:35:25 +00:00
parent dd267672cd
commit 7049932843
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/kern_prot.c
View File

@ -1242,11 +1242,6 @@ suser(struct thread *td)
* (securelevel >= level). Note that the logic is inverted -- these
* functions return EPERM on "success" and 0 on "failure".
*
* cr is permitted to be NULL for the time being, as there were some
* existing securelevel checks that occurred without a process/credential
* context. In the future this will be disallowed, so a kernel message
* is displayed.
*
* MPSAFE
*/
int
@ -1255,8 +1250,7 @@ securelevel_gt(struct ucred *cr, int level)
int active_securelevel;
active_securelevel = securelevel;
if (cr == NULL)
panic("securelevel_gt: cr is NULL\n");
KASSERT(cr != NULL, ("securelevel_gt: null cr"));
if (cr->cr_prison != NULL) {
mtx_lock(&cr->cr_prison->pr_mtx);
active_securelevel = imax(cr->cr_prison->pr_securelevel,
@ -1272,8 +1266,7 @@ securelevel_ge(struct ucred *cr, int level)
int active_securelevel;
active_securelevel = securelevel;
if (cr == NULL)
panic("securelevel_gt: cr is NULL\n");
KASSERT(cr != NULL, ("securelevel_ge: null cr"));
if (cr->cr_prison != NULL) {
mtx_lock(&cr->cr_prison->pr_mtx);
active_securelevel = imax(cr->cr_prison->pr_securelevel,