Deleted Added
full compact
mac_system.c (122524) mac_system.c (126121)
1/*-
2 * Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project in part by Network
6 * Associates Laboratories, the Security Research Division of Network
7 * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
8 * as part of the DARPA CHATS research program.

--- 16 unchanged lines hidden (view full) ---

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project in part by Network
6 * Associates Laboratories, the Security Research Division of Network
7 * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
8 * as part of the DARPA CHATS research program.

--- 16 unchanged lines hidden (view full) ---

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/security/mac/mac_system.c 122524 2003-11-12 03:14:31Z rwatson $");
33__FBSDID("$FreeBSD: head/sys/security/mac/mac_system.c 126121 2004-02-22 12:31:44Z pjd $");
34
35#include "opt_mac.h"
36
37#include <sys/param.h>
38#include <sys/kernel.h>
39#include <sys/lock.h>
40#include <sys/malloc.h>
41#include <sys/mutex.h>

--- 202 unchanged lines hidden (view full) ---

244 if (!mac_enforce_system)
245 return (0);
246
247 MAC_CHECK(check_system_swapoff, cred, vp, vp->v_label);
248 return (error);
249}
250
251int
34
35#include "opt_mac.h"
36
37#include <sys/param.h>
38#include <sys/kernel.h>
39#include <sys/lock.h>
40#include <sys/malloc.h>
41#include <sys/mutex.h>

--- 202 unchanged lines hidden (view full) ---

244 if (!mac_enforce_system)
245 return (0);
246
247 MAC_CHECK(check_system_swapoff, cred, vp, vp->v_label);
248 return (error);
249}
250
251int
252mac_check_system_sysctl(struct ucred *cred, int *name, u_int namelen,
253 void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
252mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1,
253 int arg2, struct sysctl_req *req)
254{
255 int error;
256
257 /*
258 * XXXMAC: We're very much like to assert the SYSCTL_LOCK here,
259 * but since it's not exported from kern_sysctl.c, we can't.
260 */
261 if (!mac_enforce_system)
262 return (0);
263
254{
255 int error;
256
257 /*
258 * XXXMAC: We're very much like to assert the SYSCTL_LOCK here,
259 * but since it's not exported from kern_sysctl.c, we can't.
260 */
261 if (!mac_enforce_system)
262 return (0);
263
264 MAC_CHECK(check_system_sysctl, cred, name, namelen, old, oldlenp,
265 inkernel, new, newlen);
264 MAC_CHECK(check_system_sysctl, cred, oidp, arg1, arg2, req);
266
267 return (error);
268}
265
266 return (error);
267}