Deleted Added
full compact
imgact_svr4.c (175294) imgact_svr4.c (220373)
1/*-
2 * Copyright (c) 1998 Mark Newton
3 * Copyright (c) 1994-1996 S�ren Schmidt
4 * All rights reserved.
5 *
6 * Based heavily on /sys/kern/imgact_aout.c which is:
7 * Copyright (c) 1993, David Greenman
8 *

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

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Mark Newton
3 * Copyright (c) 1994-1996 S�ren Schmidt
4 * All rights reserved.
5 *
6 * Based heavily on /sys/kern/imgact_aout.c which is:
7 * Copyright (c) 1993, David Greenman
8 *

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

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/compat/svr4/imgact_svr4.c 175294 2008-01-13 14:44:15Z attilio $");
34__FBSDID("$FreeBSD: head/sys/compat/svr4/imgact_svr4.c 220373 2011-04-05 20:23:59Z trasz $");
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/exec.h>
39#include <sys/imgact.h>
40#include <sys/imgact_aout.h>
41#include <sys/kernel.h>
42#include <sys/lock.h>
43#include <sys/mman.h>
44#include <sys/mutex.h>
45#include <sys/proc.h>
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/exec.h>
39#include <sys/imgact.h>
40#include <sys/imgact_aout.h>
41#include <sys/kernel.h>
42#include <sys/lock.h>
43#include <sys/mman.h>
44#include <sys/mutex.h>
45#include <sys/proc.h>
46#include <sys/racct.h>
46#include <sys/resourcevar.h>
47#include <sys/vnode.h>
48
49#include <vm/vm.h>
50#include <vm/vm_kern.h>
51#include <vm/vm_param.h>
52#include <vm/pmap.h>
53#include <vm/vm_map.h>

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

103 /* text + data can't exceed file size */
104 if (a_out->a_data + a_out->a_text > imgp->attr->va_size)
105 return (EFAULT);
106 /*
107 * text/data/bss must not exceed limits
108 */
109 PROC_LOCK(imgp->proc);
110 if (a_out->a_text > maxtsiz ||
47#include <sys/resourcevar.h>
48#include <sys/vnode.h>
49
50#include <vm/vm.h>
51#include <vm/vm_kern.h>
52#include <vm/vm_param.h>
53#include <vm/pmap.h>
54#include <vm/vm_map.h>

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

104 /* text + data can't exceed file size */
105 if (a_out->a_data + a_out->a_text > imgp->attr->va_size)
106 return (EFAULT);
107 /*
108 * text/data/bss must not exceed limits
109 */
110 PROC_LOCK(imgp->proc);
111 if (a_out->a_text > maxtsiz ||
111 a_out->a_data + bss_size > lim_cur(imgp->proc, RLIMIT_DATA)) {
112 a_out->a_data + bss_size > lim_cur(imgp->proc, RLIMIT_DATA) ||
113 racct_set(imgp->proc, RACCT_DATA, a_out->a_data + bss_size) != 0) {;
112 PROC_UNLOCK(imgp->proc);
113 return (ENOMEM);
114 }
115 PROC_UNLOCK(imgp->proc);
116
117 VOP_UNLOCK(imgp->vp, 0);
118
119 /*

--- 123 unchanged lines hidden ---
114 PROC_UNLOCK(imgp->proc);
115 return (ENOMEM);
116 }
117 PROC_UNLOCK(imgp->proc);
118
119 VOP_UNLOCK(imgp->vp, 0);
120
121 /*

--- 123 unchanged lines hidden ---