Remove a.out support from compat_linux(8).

Tested with the syscall regression test suite from IBM and Opera.

Requested by deraadt@.

3 files changed, 4 insertions, 383 deletions

diff --git a/sys/compat/linux/linux_exec.c b/sys/compat/linux/linux_exec.c
index 22d0b2f424b..8bdb554e531 100644
--- a/sys/compat/linux/linux_exec.c
+++ b/sys/compat/linux/linux_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_exec.c,v 1.37 2012/09/11 15:44:19 deraadt Exp $	*/
+/*	$OpenBSD: linux_exec.c,v 1.38 2013/11/03 13:52:44 pirofti Exp $	*/
 /*	$NetBSD: linux_exec.c,v 1.13 1996/04/05 00:01:10 christos Exp $	*/
 
 /*-
@@ -61,10 +61,6 @@
 #include <compat/linux/linux_exec.h>
 #include <compat/linux/linux_emuldata.h>
 
-static void *linux_aout_copyargs(struct exec_package *,
-	struct ps_strings *, void *, void *);
-
-#define	LINUX_AOUT_AUX_ARGSIZ	2
 #define LINUX_ELF_AUX_ARGSIZ (sizeof(AuxInfo) * 8 / sizeof(char *))
 
 
@@ -79,42 +75,11 @@ extern char *linux_syscallnames[];
 extern struct mutex futex_lock;
 extern void futex_pool_init(void);
 
-int exec_linux_aout_prep_zmagic(struct proc *, struct exec_package *);
-int exec_linux_aout_prep_nmagic(struct proc *, struct exec_package *);
-int exec_linux_aout_prep_omagic(struct proc *, struct exec_package *);
-int exec_linux_aout_prep_qmagic(struct proc *, struct exec_package *);
-
 void linux_e_proc_exec(struct proc *, struct exec_package *);
 void linux_e_proc_fork(struct proc *, struct proc *);
 void linux_e_proc_exit(struct proc *);
 void linux_e_proc_init(struct proc *, struct vmspace *);
 
-struct emul emul_linux_aout = {
-	"linux",
-	linux_error,
-	linux_sendsig,
-	LINUX_SYS_syscall,
-	LINUX_SYS_MAXSYSCALL,
-	linux_sysent,
-#ifdef SYSCALL_DEBUG
-	linux_syscallnames,
-#else
-	NULL,
-#endif
-	LINUX_AOUT_AUX_ARGSIZ,
-	linux_aout_copyargs,
-	setregs,
-	NULL,
-	coredump_trad,
-	linux_sigcode,
-	linux_esigcode,
-	0,
-	NULL,
-	linux_e_proc_exec,
-	linux_e_proc_fork,
-	linux_e_proc_exit,
-};
-
 struct emul emul_linux_elf = {
 	"linux",
 	linux_error,
@@ -217,250 +182,6 @@ linux_e_proc_fork(struct proc *p, struct proc *parent)
 	emul->set_tls_base = p_emul->set_tls_base;
 }
 
-static void *
-linux_aout_copyargs(struct exec_package *pack, struct ps_strings *arginfo,
-    void *stack, void *argp)
-{
-	char **cpp = stack;
-	char **stk = stack;
-	char *dp, *sp;
-	size_t len;
-	void *nullp = NULL;
-	int argc = arginfo->ps_nargvstr;
-	int envc = arginfo->ps_nenvstr;
-
-	if (copyout(&argc, cpp++, sizeof(argc)))
-		return (NULL);
-
-	/* leave room for envp and argv */
-	cpp += 2;
-	if (copyout(&cpp, &stk[1], sizeof (cpp)))
-		return (NULL);
-
-	dp = (char *)(cpp + argc + envc + 2);
-	sp = argp;
-
-	/* XXX don't copy them out, remap them! */
-	arginfo->ps_argvstr = cpp; /* remember location of argv for later */
-
-	for (; --argc >= 0; sp += len, dp += len)
-		if (copyout(&dp, cpp++, sizeof(dp)) ||
-		    copyoutstr(sp, dp, ARG_MAX, &len))
-			return (NULL);
-
-	if (copyout(&nullp, cpp++, sizeof(nullp)))
-		return (NULL);
-
-	if (copyout(&cpp, &stk[2], sizeof (cpp)))
-		return (NULL);
-
-	arginfo->ps_envstr = cpp; /* remember location of envp for later */
-
-	for (; --envc >= 0; sp += len, dp += len)
-		if (copyout(&dp, cpp++, sizeof(dp)) ||
-		    copyoutstr(sp, dp, ARG_MAX, &len))
-			return (NULL);
-
-	if (copyout(&nullp, cpp++, sizeof(nullp)))
-		return (NULL);
-
-	return (cpp);
-}
-
-int
-exec_linux_aout_makecmds(struct proc *p, struct exec_package *epp)
-{
-	struct exec *linux_ep = epp->ep_hdr;
-	int machtype, magic;
-	int error = ENOEXEC;
-
-	if (epp->ep_hdrvalid < sizeof(struct exec))
-		return (ENOEXEC);
-
-	magic = LINUX_N_MAGIC(linux_ep);
-	machtype = LINUX_N_MACHTYPE(linux_ep);
-
-
-	if (machtype != LINUX_MID_MACHINE)
-		return (ENOEXEC);
-
-	switch (magic) {
-	case QMAGIC:
-		error = exec_linux_aout_prep_qmagic(p, epp);
-		break;
-	case ZMAGIC:
-		error = exec_linux_aout_prep_zmagic(p, epp);
-		break;
-	case NMAGIC:
-		error = exec_linux_aout_prep_nmagic(p, epp);
-		break;
-	case OMAGIC:
-		error = exec_linux_aout_prep_omagic(p, epp);
-		break;
-	}
-	if (error == 0)
-		epp->ep_emul = &emul_linux_aout;
-	return (error);
-}
-
-/*
- * Since text starts at 0x400 in Linux ZMAGIC executables, and 0x400
- * is very likely not page aligned on most architectures, it is treated
- * as an NMAGIC here. XXX
- */
-
-int
-exec_linux_aout_prep_zmagic(struct proc *p, struct exec_package *epp)
-{
-	struct exec *execp = epp->ep_hdr;
-
-	epp->ep_taddr = LINUX_N_TXTADDR(*execp, ZMAGIC);
-	epp->ep_tsize = execp->a_text;
-	epp->ep_daddr = LINUX_N_DATADDR(*execp, ZMAGIC);
-	epp->ep_dsize = execp->a_data + execp->a_bss;
-	epp->ep_entry = execp->a_entry;
-
-	/* set up command for text segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, execp->a_text,
-	    epp->ep_taddr, epp->ep_vp, LINUX_N_TXTOFF(*execp, ZMAGIC),
-	    VM_PROT_READ|VM_PROT_EXECUTE);
-
-	/* set up command for data segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, execp->a_data,
-	    epp->ep_daddr, epp->ep_vp, LINUX_N_DATOFF(*execp, ZMAGIC),
-	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	/* set up command for bss segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss,
-	    epp->ep_daddr + execp->a_data, NULLVP, 0,
-	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	return (exec_setup_stack(p, epp));
-}
-
-/*
- * exec_aout_prep_nmagic(): Prepare Linux NMAGIC package.
- * Not different from the normal stuff.
- */
-
-int
-exec_linux_aout_prep_nmagic(struct proc *p, struct exec_package *epp)
-{
-	struct exec *execp = epp->ep_hdr;
-	long bsize, baddr;
-
-	epp->ep_taddr = LINUX_N_TXTADDR(*execp, NMAGIC);
-	epp->ep_tsize = execp->a_text;
-	epp->ep_daddr = LINUX_N_DATADDR(*execp, NMAGIC);
-	epp->ep_dsize = execp->a_data + execp->a_bss;
-	epp->ep_entry = execp->a_entry;
-
-	/* set up command for text segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, execp->a_text,
-	    epp->ep_taddr, epp->ep_vp, LINUX_N_TXTOFF(*execp, NMAGIC),
-	    VM_PROT_READ|VM_PROT_EXECUTE);
-
-	/* set up command for data segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, execp->a_data,
-	    epp->ep_daddr, epp->ep_vp, LINUX_N_DATOFF(*execp, NMAGIC),
-	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	/* set up command for bss segment */
-	baddr = round_page(epp->ep_daddr + execp->a_data);
-	bsize = epp->ep_daddr + epp->ep_dsize - baddr;
-	if (bsize > 0)
-		NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
-		    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	return (exec_setup_stack(p, epp));
-}
-
-/*
- * exec_aout_prep_omagic(): Prepare Linux OMAGIC package.
- * Business as usual.
- */
-
-int
-exec_linux_aout_prep_omagic(struct proc *p, struct exec_package *epp)
-{
-	struct exec *execp = epp->ep_hdr;
-	long dsize, bsize, baddr;
-
-	epp->ep_taddr = LINUX_N_TXTADDR(*execp, OMAGIC);
-	epp->ep_tsize = execp->a_text;
-	epp->ep_daddr = LINUX_N_DATADDR(*execp, OMAGIC);
-	epp->ep_dsize = execp->a_data + execp->a_bss;
-	epp->ep_entry = execp->a_entry;
-
-	/* set up command for text and data segments */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn,
-	    execp->a_text + execp->a_data, epp->ep_taddr, epp->ep_vp,
-	    LINUX_N_TXTOFF(*execp, OMAGIC), VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	/* set up command for bss segment */
-	baddr = round_page(epp->ep_daddr + execp->a_data);
-	bsize = epp->ep_daddr + epp->ep_dsize - baddr;
-	if (bsize > 0)
-		NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
-		    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	/*
-	 * Make sure (# of pages) mapped above equals (vm_tsize + vm_dsize);
-	 * obreak(2) relies on this fact. Both `vm_tsize' and `vm_dsize' are
-	 * computed (in execve(2)) by rounding *up* `ep_tsize' and `ep_dsize'
-	 * respectively to page boundaries.
-	 * Compensate `ep_dsize' for the amount of data covered by the last
-	 * text page. 
-	 */
-	dsize = epp->ep_dsize + execp->a_text - round_page(execp->a_text);
-	epp->ep_dsize = (dsize > 0) ? dsize : 0;
-	return (exec_setup_stack(p, epp));
-}
-
-int
-exec_linux_aout_prep_qmagic(struct proc *p, struct exec_package *epp)
-{
-	struct exec *execp = epp->ep_hdr;
-
-	epp->ep_taddr = LINUX_N_TXTADDR(*execp, QMAGIC);
-	epp->ep_tsize = execp->a_text;
-	epp->ep_daddr = LINUX_N_DATADDR(*execp, QMAGIC);
-	epp->ep_dsize = execp->a_data + execp->a_bss;
-	epp->ep_entry = execp->a_entry;
-
-	/*
-	 * check if vnode is in open for writing, because we want to
-	 * demand-page out of it.  if it is, don't do it, for various
-	 * reasons
-	 */
-	if ((execp->a_text != 0 || execp->a_data != 0) &&
-	    epp->ep_vp->v_writecount != 0) {
-#ifdef DIAGNOSTIC
-		if (epp->ep_vp->v_flag & VTEXT)
-			panic("exec: a VTEXT vnode has writecount != 0");
-#endif
-		return (ETXTBSY);
-	}
-	vn_marktext(epp->ep_vp);
-
-	/* set up command for text segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_text,
-	    epp->ep_taddr, epp->ep_vp, LINUX_N_TXTOFF(*execp, QMAGIC),
-	    VM_PROT_READ|VM_PROT_EXECUTE);
-
-	/* set up command for data segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_pagedvn, execp->a_data,
-	    epp->ep_daddr, epp->ep_vp, LINUX_N_DATOFF(*execp, QMAGIC),
-	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	/* set up command for bss segment */
-	NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss,
-	    epp->ep_daddr + execp->a_data, NULLVP, 0,
-	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-
-	return (exec_setup_stack(p, epp));
-}
-
 int
 exec_linux_elf32_makecmds(struct proc *p, struct exec_package *epp)
 {
@@ -520,103 +241,6 @@ recognized:
 }
 
 /*
- * The Linux system call to load shared libraries, a.out version. The
- * a.out shared libs are just files that are mapped onto a fixed
- * address in the process' address space. The address is given in
- * a_entry. Read in the header, set up some VM commands and run them.
- *
- * Yes, both text and data are mapped at once, so we're left with
- * writeable text for the shared libs. The Linux crt0 seemed to break
- * sometimes when data was mapped separately. It munmapped a uselib()
- * of ld.so by hand, which failed with shared text and data for ld.so
- * Yuck.
- *
- * Because of the problem with ZMAGIC executables (text starts
- * at 0x400 in the file, but needs to be mapped at 0), ZMAGIC
- * shared libs are not handled very efficiently :-(
- */
-
-int
-linux_sys_uselib(struct proc *p, void *v, register_t *retval)
-{
-	struct linux_sys_uselib_args /* {
-		syscallarg(char *) path;
-	} */ *uap = v;
-	caddr_t sg;
-	long bsize, dsize, tsize, taddr, baddr, daddr;
-	struct nameidata ni;
-	struct vnode *vp;
-	struct exec hdr;
-	struct exec_vmcmd_set vcset;
-	int i, magic, error;
-	size_t rem;
-
-	sg = stackgap_init(p->p_emul);
-	LINUX_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
-
-	NDINIT(&ni, LOOKUP, FOLLOW, UIO_USERSPACE, SCARG(uap, path), p);
-
-	if ((error = namei(&ni)))
-		return (error);
-
-	vp = ni.ni_vp;
-
-	if ((error = vn_rdwr(UIO_READ, vp, (caddr_t) &hdr, LINUX_AOUT_HDR_SIZE,
-			     0, UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
-			     &rem, p))) {
-		vrele(vp);
-		return (error);
-	}
-
-	if (rem != 0) {
-		vrele(vp);
-		return (ENOEXEC);
-	}
-
-	if (LINUX_N_MACHTYPE(&hdr) != LINUX_MID_MACHINE)
-		return (ENOEXEC);
-
-	magic = LINUX_N_MAGIC(&hdr);
-	taddr = trunc_page(hdr.a_entry);
-	tsize = hdr.a_text;
-	daddr = taddr + tsize;
-	dsize = hdr.a_data + hdr.a_bss;
-
-	if ((hdr.a_text != 0 || hdr.a_data != 0) && vp->v_writecount != 0) {
-		vrele(vp);
-                return (ETXTBSY);
-        }
-	vn_marktext(vp);
-
-	VMCMDSET_INIT(&vcset);
-
-	NEW_VMCMD(
-	    &vcset, magic == ZMAGIC ? vmcmd_map_readvn : vmcmd_map_pagedvn,
-	    hdr.a_text + hdr.a_data, taddr, vp, LINUX_N_TXTOFF(hdr, magic),
-	    VM_PROT_READ|VM_PROT_EXECUTE|VM_PROT_WRITE);
-
-	baddr = round_page(daddr + hdr.a_data);
-	bsize = daddr + dsize - baddr;
-        if (bsize > 0) {
-                NEW_VMCMD(&vcset, vmcmd_map_zero, bsize, baddr,
-                    NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
-	}
-
-	for (i = 0; i < vcset.evs_used && !error; i++) {
-		struct exec_vmcmd *vcp;
-
-		vcp = &vcset.evs_cmds[i];
-		error = (*vcp->ev_proc)(p, vcp);
-	}
-
-	kill_vmcmds(&vcset);
-
-	vrele(vp);
-
-	return (error);
-}
-
-/*
  * Execve(2). Just check the alternate emulation path, and pass it on
  * to the regular execve().
  */
diff --git a/sys/compat/linux/linux_exec.h b/sys/compat/linux/linux_exec.h
index b216205a5a6..8744c18e90f 100644
--- a/sys/compat/linux/linux_exec.h
+++ b/sys/compat/linux/linux_exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_exec.h,v 1.8 2012/09/11 15:44:19 deraadt Exp $	*/
+/*	$OpenBSD: linux_exec.h,v 1.9 2013/11/03 13:52:44 pirofti Exp $	*/
 /*	$NetBSD: linux_exec.h,v 1.5 1995/10/07 06:27:01 mycroft Exp $	*/
 
 /*
@@ -44,8 +44,6 @@
 #define LINUX_MID_MACHINE LINUX_M_I386
 #endif
 
-#define LINUX_AOUT_HDR_SIZE (sizeof (struct exec))
-
 #define LINUX_N_MAGIC(ep)    ((ep)->a_midmag & 0xffff)
 #define LINUX_N_MACHTYPE(ep) (((ep)->a_midmag >> 16) & 0xff)
 
@@ -66,7 +64,6 @@
 
 #define LINUX_N_BSSADDR(x,m) (LINUX_N_DATADDR(x,m) + (x).a_data)
 
-int exec_linux_aout_makecmds(struct proc *, struct exec_package *);
 int exec_linux_elf32_makecmds(struct proc *, struct exec_package *);
 
 int linux_elf_probe(struct proc *, struct exec_package *, char *,
diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master
index c847d820c81..c46067207f1 100644
--- a/sys/compat/linux/syscalls.master
+++ b/sys/compat/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.74 2013/10/25 05:10:03 guenther Exp $
+	$OpenBSD: syscalls.master,v 1.75 2013/11/03 13:52:44 pirofti Exp $
 ;	$NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -158,7 +158,7 @@
 			    struct linux_stat *up); } olstat
 85	STD		{ int linux_sys_readlink(char *name, char *buf, \
 			    int count); }
-86	STD		{ int linux_sys_uselib(char *path); }
+86	UNIMPL		linux_sys_uselib
 87	STD		{ int linux_sys_swapon(char *name); }
 88	NOARGS		{ int sys_reboot(int opt); }
 89	STD		{ int linux_sys_readdir(int fd, caddr_t dent, \