From owner-svn-src-all@freebsd.org  Thu Apr 20 15:53:21 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5D7FD48AA8;
 Thu, 20 Apr 2017 15:53:21 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B79823CE;
 Thu, 20 Apr 2017 15:53:21 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3KFrKdq068496;
 Thu, 20 Apr 2017 15:53:20 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KFrKaZ068495;
 Thu, 20 Apr 2017 15:53:20 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201704201553.v3KFrKaZ068495@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 20 Apr 2017 15:53:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317197 - head/sys/arm64/arm64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Apr 2017 15:53:22 -0000

Author: andrew
Date: Thu Apr 20 15:53:20 2017
New Revision: 317197
URL: https://svnweb.freebsd.org/changeset/base/317197

Log:
  Restrict the arm64 supervisor all instructions to only allow a zero
  immediate value for system calls. We may wish to use other values in the
  future for other purposes.
  
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm64/arm64/trap.c

Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c	Thu Apr 20 15:18:15 2017	(r317196)
+++ head/sys/arm64/arm64/trap.c	Thu Apr 20 15:53:20 2017	(r317197)
@@ -135,8 +135,13 @@ svc_handler(struct thread *td, struct tr
 	struct syscall_args sa;
 	int error;
 
-	error = syscallenter(td, &sa);
-	syscallret(td, error, &sa);
+	if ((frame->tf_esr & ESR_ELx_ISS_MASK) == 0) {
+		error = syscallenter(td, &sa);
+		syscallret(td, error, &sa);
+	} else {
+		call_trapsignal(td, SIGILL, ILL_ILLOPN, (void *)frame->tf_elr);
+		userret(td, frame);
+	}
 }
 
 static void