diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-02-14 18:52:43 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-02-14 18:52:43 +0000 |
| commit | c7301501a540e75d02c61e392e3c079e8b8de06c (patch) | |
| tree | 69af37069f2000895941cb29812e1adcd878ccc0 /sys/kern | |
| parent | 8caf918eda0b4024483d8138c382997b249284e7 (diff) | |
| download | FreeBSD-src-c7301501a540e75d02c61e392e3c079e8b8de06c.zip FreeBSD-src-c7301501a540e75d02c61e392e3c079e8b8de06c.tar.gz | |
Fix mismerge in last commit: check that cred->cr_prison is NULL
before dereferencing the prison pointer.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_jail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 8d19dcb..94ac0aa 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -431,7 +431,7 @@ int prison_check_mount(struct ucred *cred, struct mount *mp) { - if (jail_getfsstatroot_only) { + if (jail_getfsstatroot_only && cred->cr_prison != NULL) { if (cred->cr_prison->pr_root->v_mount != mp) return (0); } |
