Commit 987f20a9 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Kees Cook
Browse files

a.out: Remove the a.out implementation 



In commit 19e8b701 ("a.out: Stop building a.out/osf1 support on
alpha and m68k") the last users of a.out were disabled.

As nothing has turned up to cause this change to be reverted, let's
remove the code implementing a.out support as well.

There may be userspace users of the uapi bits left so the uapi
headers have been left untouched.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Arnd Bergmann <arnd@arndb.de> # arm defconfigs
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/871qrx3hq3.fsf@email.froward.int.ebiederm.org
parent 33a2d6bc

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7685,7 +7685,6 @@ R: Kees Cook <keescook@chromium.org> 
L:	linux-mm@kvack.org

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve

F:	arch/alpha/kernel/binfmt_loader.c

F:	fs/*binfmt_*.c

F:	fs/exec.c

F:	include/linux/binfmts.h

arch/alpha/include/asm/a.out.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ALPHA_A_OUT_H__

#define __ALPHA_A_OUT_H__



#include <uapi/asm/a.out.h>





/* Assume that start addresses below 4G belong to a TASO application.

   Unfortunately, there is no proper bit in the exec header to check.

   Worse, we have to notice the start address before swapping to use

   /sbin/loader, which of course is _not_ a TASO application.  */

#define SET_AOUT_PERSONALITY(BFPM, EX) \

	set_personality (((BFPM->taso || EX.ah.entry < 0x100000000L \

			   ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))



#endif /* __A_OUT_GNU_H__ */

arch/alpha/kernel/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ else 
# Misc support

obj-$(CONFIG_ALPHA_SRM)		+= srmcons.o



ifdef CONFIG_BINFMT_AOUT

obj-y	+= binfmt_loader.o

endif



# Core logic support

obj-$(CONFIG_ALPHA_APECS)	+= core_apecs.o

obj-$(CONFIG_ALPHA_CIA)		+= core_cia.o

arch/alpha/kernel/binfmt_loader.c

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/init.h>

#include <linux/fs.h>

#include <linux/file.h>

#include <linux/mm_types.h>

#include <linux/binfmts.h>

#include <linux/a.out.h>



static int load_binary(struct linux_binprm *bprm)

{

	struct exec *eh = (struct exec *)bprm->buf;

	unsigned long loader;

	struct file *file;

	int retval;



	if (eh->fh.f_magic != 0x183 || (eh->fh.f_flags & 0x3000) != 0x3000)

		return -ENOEXEC;



	if (bprm->loader)

		return -ENOEXEC;



	loader = bprm->vma->vm_end - sizeof(void *);



	file = open_exec("/sbin/loader");

	retval = PTR_ERR(file);

	if (IS_ERR(file))

		return retval;



	/* Remember if the application is TASO.  */

	bprm->taso = eh->ah.entry < 0x100000000UL;



	bprm->interpreter = file;

	bprm->loader = loader;

	return 0;

}



static struct linux_binfmt loader_format = {

	.load_binary	= load_binary,

};



static int __init init_loader_binfmt(void)

{

	insert_binfmt(&loader_format);

	return 0;

}

arch_initcall(init_loader_binfmt);

arch/alpha/kernel/osf_sys.c

+0 −30
Original line number Diff line number Diff line
@@ -1278,45 +1278,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 
	return addr;

}



#ifdef CONFIG_OSF4_COMPAT

/* Clear top 32 bits of iov_len in the user's buffer for

   compatibility with old versions of OSF/1 where iov_len

   was defined as int. */

static int

osf_fix_iov_len(const struct iovec __user *iov, unsigned long count)

{

	unsigned long i;



	for (i = 0 ; i < count ; i++) {

		int __user *iov_len_high = (int __user *)&iov[i].iov_len + 1;



		if (put_user(0, iov_len_high))

			return -EFAULT;

	}

	return 0;

}

#endif



SYSCALL_DEFINE3(osf_readv, unsigned long, fd,

		const struct iovec __user *, vector, unsigned long, count)

{

#ifdef CONFIG_OSF4_COMPAT

	if (unlikely(personality(current->personality) == PER_OSF4))

		if (osf_fix_iov_len(vector, count))

			return -EFAULT;

#endif



	return sys_readv(fd, vector, count);

}



SYSCALL_DEFINE3(osf_writev, unsigned long, fd,

		const struct iovec __user *, vector, unsigned long, count)

{

#ifdef CONFIG_OSF4_COMPAT

	if (unlikely(personality(current->personality) == PER_OSF4))

		if (osf_fix_iov_len(vector, count))

			return -EFAULT;

#endif

	return sys_writev(fd, vector, count);

}