From: deraadt <deraadt@openbsd.org>
Date: Mon, 8 Mar 2021 05:57:34 +0000 (+0000)
Subject: Remove the workaround which identified Go executables, and permitted them
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=570e619d6099ecbb649efb5d979ef48447241d1f;p=openbsd

Remove the workaround which identified Go executables, and permitted them
to do syscalls directly.  Go executables now use shared libc like all other
dynamic binaries.  This makes the "where are syscalls done from" checker
strict for all binaries, and also opens the door to change the underlying
syscall ABI to the kernel in the future very easily (if we find cause).
ok jsing
---

diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 4fa5ec22aab..33db17a1229 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.158 2021/02/08 10:51:01 mpi Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.159 2021/03/08 05:57:34 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -151,14 +151,12 @@ struct emul emul_elf = {
 };
 
 #define ELF_NOTE_NAME_OPENBSD	0x01
-#define ELF_NOTE_NAME_GO	0x02
 
 struct elf_note_name {
 	char *name;
 	int id;
 } elf_note_names[] = {
 	{ "OpenBSD",	ELF_NOTE_NAME_OPENBSD },
-	{ "Go",		ELF_NOTE_NAME_GO }
 };
 
 #define	ELFROUNDSIZE	sizeof(Elf_Word)
@@ -637,10 +635,7 @@ exec_elf_makecmds(struct proc *p, struct exec_package *epp)
 				addr = ELF_NO_ADDR;
 
 			/* Permit system calls in specific main-programs */
-			if (names & ELF_NOTE_NAME_GO) {
-				/* go main-binaries; we await a libc future */
-				flags |= VMCMD_SYSCALL;
-			} else if (interp == NULL) {
+			if (interp == NULL) {
 				/* statics. Also block the ld.so syscall-grant */
 				flags |= VMCMD_SYSCALL;
 				p->p_vmspace->vm_map.flags |= VM_MAP_SYSCALL_ONCE;