Deleted Added
full compact
imgact_linux.c (101308) imgact_linux.c (101771)
1/*-
2 * Copyright (c) 1994-1996 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Based heavily on /sys/kern/imgact_aout.c which is:
6 * Copyright (c) 1993, David Greenman
7 *
8 * Redistribution and use in source and binary forms, with or without

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

23 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
24 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 *
1/*-
2 * Copyright (c) 1994-1996 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Based heavily on /sys/kern/imgact_aout.c which is:
6 * Copyright (c) 1993, David Greenman
7 *
8 * Redistribution and use in source and binary forms, with or without

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

23 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
24 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 *
31 * $FreeBSD: head/sys/i386/linux/imgact_linux.c 101308 2002-08-04 10:29:36Z jeff $
31 * $FreeBSD: head/sys/i386/linux/imgact_linux.c 101771 2002-08-13 06:55:28Z jeff $
32 */
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/exec.h>
37#include <sys/imgact.h>
38#include <sys/imgact_aout.h>
39#include <sys/kernel.h>

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

60 struct image_params *imgp;
61{
62 const struct exec *a_out = (const struct exec *) imgp->image_header;
63 struct vmspace *vmspace;
64 vm_offset_t vmaddr;
65 unsigned long virtual_offset, file_offset;
66 vm_offset_t buffer;
67 unsigned long bss_size;
32 */
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/exec.h>
37#include <sys/imgact.h>
38#include <sys/imgact_aout.h>
39#include <sys/kernel.h>

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

60 struct image_params *imgp;
61{
62 const struct exec *a_out = (const struct exec *) imgp->image_header;
63 struct vmspace *vmspace;
64 vm_offset_t vmaddr;
65 unsigned long virtual_offset, file_offset;
66 vm_offset_t buffer;
67 unsigned long bss_size;
68 struct thread *td = curthread;
68 int error;
69
70 if (((a_out->a_magic >> 16) & 0xff) != 0x64)
71 return -1;
72
73 /*
74 * Set file/virtual offset based on a.out variant.
75 */

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

105 /*
106 * text/data/bss must not exceed limits
107 */
108 mtx_assert(&Giant, MA_OWNED);
109 if (a_out->a_text > maxtsiz ||
110 a_out->a_data + bss_size > imgp->proc->p_rlimit[RLIMIT_DATA].rlim_cur)
111 return (ENOMEM);
112
69 int error;
70
71 if (((a_out->a_magic >> 16) & 0xff) != 0x64)
72 return -1;
73
74 /*
75 * Set file/virtual offset based on a.out variant.
76 */

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

106 /*
107 * text/data/bss must not exceed limits
108 */
109 mtx_assert(&Giant, MA_OWNED);
110 if (a_out->a_text > maxtsiz ||
111 a_out->a_data + bss_size > imgp->proc->p_rlimit[RLIMIT_DATA].rlim_cur)
112 return (ENOMEM);
113
114 VOP_UNLOCK(imgp->vp, 0, td);
115
113 /* copy in arguments and/or environment from old process */
114 error = exec_extract_strings(imgp);
115 if (error)
116 /* copy in arguments and/or environment from old process */
117 error = exec_extract_strings(imgp);
118 if (error)
116 return (error);
119 goto fail;
117
118 /*
119 * Destroy old process VM and create a new one (with a new stack)
120 */
121 exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK);
122 vmspace = imgp->proc->p_vmspace;
123
124 /*

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

133 /*
134 * Map text+data+bss read/write/execute
135 */
136 vmaddr = virtual_offset;
137 error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
138 a_out->a_text + a_out->a_data + bss_size, FALSE,
139 VM_PROT_ALL, VM_PROT_ALL, 0);
140 if (error)
120
121 /*
122 * Destroy old process VM and create a new one (with a new stack)
123 */
124 exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK);
125 vmspace = imgp->proc->p_vmspace;
126
127 /*

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

136 /*
137 * Map text+data+bss read/write/execute
138 */
139 vmaddr = virtual_offset;
140 error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
141 a_out->a_text + a_out->a_data + bss_size, FALSE,
142 VM_PROT_ALL, VM_PROT_ALL, 0);
143 if (error)
141 return error;
144 goto fail;
142
143 error = vm_mmap(kernel_map, &buffer,
144 round_page(a_out->a_text + a_out->a_data + file_offset),
145 VM_PROT_READ, VM_PROT_READ, 0,
146 (caddr_t) imgp->vp, trunc_page(file_offset));
147 if (error)
145
146 error = vm_mmap(kernel_map, &buffer,
147 round_page(a_out->a_text + a_out->a_data + file_offset),
148 VM_PROT_READ, VM_PROT_READ, 0,
149 (caddr_t) imgp->vp, trunc_page(file_offset));
150 if (error)
148 return error;
151 goto fail;
149
150 error = copyout((caddr_t)(void *)(uintptr_t)(buffer + file_offset),
151 (caddr_t)vmaddr, a_out->a_text + a_out->a_data);
152
153 vm_map_remove(kernel_map, buffer,
154 buffer + round_page(a_out->a_text + a_out->a_data + file_offset));
155
156 if (error)
152
153 error = copyout((caddr_t)(void *)(uintptr_t)(buffer + file_offset),
154 (caddr_t)vmaddr, a_out->a_text + a_out->a_data);
155
156 vm_map_remove(kernel_map, buffer,
157 buffer + round_page(a_out->a_text + a_out->a_data + file_offset));
158
159 if (error)
157 return error;
160 goto fail;
158
159 /*
160 * remove write enable on the 'text' part
161 */
162 error = vm_map_protect(&vmspace->vm_map,
163 vmaddr,
164 vmaddr + a_out->a_text,
165 VM_PROT_EXECUTE|VM_PROT_READ,
166 TRUE);
167 if (error)
161
162 /*
163 * remove write enable on the 'text' part
164 */
165 error = vm_map_protect(&vmspace->vm_map,
166 vmaddr,
167 vmaddr + a_out->a_text,
168 VM_PROT_EXECUTE|VM_PROT_READ,
169 TRUE);
170 if (error)
168 return error;
171 goto fail;
169 }
170 else {
171#ifdef DEBUG
172 printf("imgact: Page aligned binary %lu\n", file_offset);
173#endif
174 /*
175 * Map text+data read/execute
176 */
177 vmaddr = virtual_offset;
178 error = vm_mmap(&vmspace->vm_map, &vmaddr,
179 a_out->a_text + a_out->a_data,
180 VM_PROT_READ | VM_PROT_EXECUTE,
181 VM_PROT_ALL,
182 MAP_PRIVATE | MAP_FIXED,
183 (caddr_t)imgp->vp, file_offset);
184 if (error)
172 }
173 else {
174#ifdef DEBUG
175 printf("imgact: Page aligned binary %lu\n", file_offset);
176#endif
177 /*
178 * Map text+data read/execute
179 */
180 vmaddr = virtual_offset;
181 error = vm_mmap(&vmspace->vm_map, &vmaddr,
182 a_out->a_text + a_out->a_data,
183 VM_PROT_READ | VM_PROT_EXECUTE,
184 VM_PROT_ALL,
185 MAP_PRIVATE | MAP_FIXED,
186 (caddr_t)imgp->vp, file_offset);
187 if (error)
185 return (error);
188 goto fail;
186
187#ifdef DEBUG
188 printf("imgact: startaddr=%08lx, length=%08lx\n",
189 (u_long)vmaddr, a_out->a_text + a_out->a_data);
190#endif
191 /*
192 * allow read/write of data
193 */
194 error = vm_map_protect(&vmspace->vm_map,
195 vmaddr + a_out->a_text,
196 vmaddr + a_out->a_text + a_out->a_data,
197 VM_PROT_ALL,
198 FALSE);
199 if (error)
189
190#ifdef DEBUG
191 printf("imgact: startaddr=%08lx, length=%08lx\n",
192 (u_long)vmaddr, a_out->a_text + a_out->a_data);
193#endif
194 /*
195 * allow read/write of data
196 */
197 error = vm_map_protect(&vmspace->vm_map,
198 vmaddr + a_out->a_text,
199 vmaddr + a_out->a_text + a_out->a_data,
200 VM_PROT_ALL,
201 FALSE);
202 if (error)
200 return (error);
203 goto fail;
201
202 /*
203 * Allocate anon demand-zeroed area for uninitialized data
204 */
205 if (bss_size != 0) {
206 vmaddr = virtual_offset + a_out->a_text + a_out->a_data;
207 error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
208 bss_size, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
209 if (error)
204
205 /*
206 * Allocate anon demand-zeroed area for uninitialized data
207 */
208 if (bss_size != 0) {
209 vmaddr = virtual_offset + a_out->a_text + a_out->a_data;
210 error = vm_map_find(&vmspace->vm_map, NULL, 0, &vmaddr,
211 bss_size, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
212 if (error)
210 return (error);
213 goto fail;
211#ifdef DEBUG
212 printf("imgact: bssaddr=%08lx, length=%08lx\n",
213 (u_long)vmaddr, bss_size);
214#endif
215
216 }
217 /* Indicate that this file should not be modified */
218 mp_fixme("Unlocked v_flag access");

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

225 vmspace->vm_daddr = (caddr_t)(void *)(uintptr_t)
226 (virtual_offset + a_out->a_text);
227
228 /* Fill in image_params */
229 imgp->interpreted = 0;
230 imgp->entry_addr = a_out->a_entry;
231
232 imgp->proc->p_sysent = &linux_sysvec;
214#ifdef DEBUG
215 printf("imgact: bssaddr=%08lx, length=%08lx\n",
216 (u_long)vmaddr, bss_size);
217#endif
218
219 }
220 /* Indicate that this file should not be modified */
221 mp_fixme("Unlocked v_flag access");

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

228 vmspace->vm_daddr = (caddr_t)(void *)(uintptr_t)
229 (virtual_offset + a_out->a_text);
230
231 /* Fill in image_params */
232 imgp->interpreted = 0;
233 imgp->entry_addr = a_out->a_entry;
234
235 imgp->proc->p_sysent = &linux_sysvec;
233 return (0);
236
237fail:
238 vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
239 return (error);
234}
235
236/*
237 * Tell kern_execve.c about it, with a little help from the linker.
238 */
239static struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" };
240EXEC_SET(linuxaout, linux_execsw);
240}
241
242/*
243 * Tell kern_execve.c about it, with a little help from the linker.
244 */
245static struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" };
246EXEC_SET(linuxaout, linux_execsw);