d903306a26
work present in FreeBSD 7.0 to refine the kernel privilege model: - Introduce support for jail as a testing variable, in order to confirm that privileges are properly restricted in the jail environment. - Restructure overall testing approach so that privilege and jail conditions are set in the testing infrastructure before tests are invoked, and done so in a custom-created process to isolate the impact of tests from each other in a more consistent way. - Tests now provide setup and cleanup hooks that occur before and after the test runs. - New privilege tests are now present for several audit privileges, several credential management privileges, dmesg buffer reading privilege, and netinet raw socket creation. - Other existing tests are restructured and generally improved as a result of better framework structure and jail as a variable. For exampe, we now test that certain sysctls are writable only outside jail, while others are writable within jail. On a similar note, privileges relating to setting UFS file flags are now better exercised, as with the right to chmod and utimes files. Approved by: re (bmah) Obtained from: TrustedBSD Project
98 lines
2.9 KiB
C
98 lines
2.9 KiB
C
/*-
|
|
* Copyright (c) 2006 nCircle Network Security, Inc.
|
|
* Copyright (c) 2007 Robert N. M. Watson
|
|
* All rights reserved.
|
|
*
|
|
* This software was developed by Robert N. M. Watson for the TrustedBSD
|
|
* Project under contract to nCircle Network Security, Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR, NCIRCLE NETWORK SECURITY,
|
|
* INC., OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
|
|
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
/*
|
|
* Confirm that calls to fhopen() require non-jailed priilege. We create a
|
|
* temporary file and grab the file handle using getfh() before starting.
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/mount.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
|
|
#include "main.h"
|
|
|
|
static char fpath[1024];
|
|
static int fpath_initialized;
|
|
static fhandle_t fh;
|
|
|
|
int
|
|
priv_vfs_fhopen_setup(int asroot, int injail, struct test *test)
|
|
{
|
|
|
|
setup_file("private_vfs_fhopen_setup: fpath", fpath, UID_ROOT,
|
|
GID_WHEEL, 0644);
|
|
fpath_initialized = 1;
|
|
if (getfh(fpath, &fh) < 0) {
|
|
warn("priv_vfs_fhopen_setup: getfh(%s)", fpath);
|
|
return (-1);
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
void
|
|
priv_vfs_fhopen(int asroot, int injail, struct test *test)
|
|
{
|
|
int errno_saved, error, fd;
|
|
|
|
fd = fhopen(&fh, O_RDONLY);
|
|
if (fd >= 0) {
|
|
error = 0;
|
|
errno_saved = errno;
|
|
close(fd);
|
|
errno = errno_saved;
|
|
} else
|
|
error = -1;
|
|
if (asroot && injail)
|
|
expect("priv_vfs_fhopen(asroot, injail)", error, -1, EPERM);
|
|
if (asroot && !injail)
|
|
expect("priv_vfs_fhopen(asroot, !injail)", error, 0, 0);
|
|
if (!asroot && injail)
|
|
expect("priv_vfs_fhopen(!asroot, injail)", error, -1, EPERM);
|
|
if (!asroot && !injail)
|
|
expect("priv_vfs_fhopen(!asroot, !injail)", error, -1, EPERM);
|
|
}
|
|
|
|
void
|
|
priv_vfs_fhopen_cleanup(int asroot, int injail, struct test *test)
|
|
{
|
|
|
|
if (fpath_initialized) {
|
|
(void)unlink(fpath);
|
|
fpath_initialized = 0;
|
|
}
|
|
}
|