Deleted Added
full compact
kern_exec.c (223692) kern_exec.c (224159)
1/*-
2 * Copyright (c) 1993, David Greenman
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1993, David Greenman
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 223692 2011-06-30 10:56:02Z jonathan $");
28__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 224159 2011-07-17 23:05:24Z rwatson $");
29
30#include "opt_capsicum.h"
31#include "opt_hwpmc_hooks.h"
32#include "opt_kdtrace.h"
33#include "opt_ktrace.h"
34#include "opt_vm.h"
35
36#include <sys/param.h>
37#include <sys/capability.h>
38#include <sys/systm.h>
29
30#include "opt_capsicum.h"
31#include "opt_hwpmc_hooks.h"
32#include "opt_kdtrace.h"
33#include "opt_ktrace.h"
34#include "opt_vm.h"
35
36#include <sys/param.h>
37#include <sys/capability.h>
38#include <sys/systm.h>
39#include <sys/capability.h>
39#include <sys/eventhandler.h>
40#include <sys/lock.h>
41#include <sys/mutex.h>
42#include <sys/sysproto.h>
43#include <sys/signalvar.h>
44#include <sys/kernel.h>
45#include <sys/mount.h>
46#include <sys/filedesc.h>

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

108static int do_execve(struct thread *td, struct image_args *args,
109 struct mac *mac_p);
110
111/* XXX This should be vm_size_t. */
112SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG|CTLFLAG_RD,
113 NULL, 0, sysctl_kern_ps_strings, "LU", "");
114
115/* XXX This should be vm_size_t. */
40#include <sys/eventhandler.h>
41#include <sys/lock.h>
42#include <sys/mutex.h>
43#include <sys/sysproto.h>
44#include <sys/signalvar.h>
45#include <sys/kernel.h>
46#include <sys/mount.h>
47#include <sys/filedesc.h>

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

109static int do_execve(struct thread *td, struct image_args *args,
110 struct mac *mac_p);
111
112/* XXX This should be vm_size_t. */
113SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG|CTLFLAG_RD,
114 NULL, 0, sysctl_kern_ps_strings, "LU", "");
115
116/* XXX This should be vm_size_t. */
116SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG|CTLFLAG_RD,
117 NULL, 0, sysctl_kern_usrstack, "LU", "");
117SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG|CTLFLAG_RD|
118 CTLFLAG_CAPRD, NULL, 0, sysctl_kern_usrstack, "LU", "");
118
119SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT|CTLFLAG_RD,
120 NULL, 0, sysctl_kern_stackprot, "I", "");
121
122u_long ps_arg_cache_limit = PAGE_SIZE / 16;
123SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW,
124 &ps_arg_cache_limit, 0, "");
125

--- 1447 unchanged lines hidden ---
119
120SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT|CTLFLAG_RD,
121 NULL, 0, sysctl_kern_stackprot, "I", "");
122
123u_long ps_arg_cache_limit = PAGE_SIZE / 16;
124SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW,
125 &ps_arg_cache_limit, 0, "");
126

--- 1447 unchanged lines hidden ---