svn commit: r366706 - head/sys/arm64/arm64

Andrew Turner andrew at FreeBSD.org
Wed Oct 14 15:31:42 UTC 2020


Author: andrew
Date: Wed Oct 14 15:31:42 2020
New Revision: 366706
URL: https://svnweb.freebsd.org/changeset/base/366706

Log:
  Remove direct user access from the arm64 copyinstr
  
  These already use the load variant that simulates userspace access.
  Remove the macros that enable normal loads and stores from userspace
  as they are unneeded.
  
  Sponsored by:	Innovate UK

Modified:
  head/sys/arm64/arm64/copyinout.S

Modified: head/sys/arm64/arm64/copyinout.S
==============================================================================
--- head/sys/arm64/arm64/copyinout.S	Wed Oct 14 15:26:19 2020	(r366705)
+++ head/sys/arm64/arm64/copyinout.S	Wed Oct 14 15:31:42 2020	(r366706)
@@ -100,7 +100,6 @@ ENTRY(copyinstr)
 
 	adr	x6, copyio_fault /* Get the handler address */
 	SET_FAULT_HANDLER(x6, x7) /* Set the handler */
-	ENTER_USER_ACCESS(w6, x7)
 
 	ldr	x7, =VM_MAXUSER_ADDRESS
 1:	cmp	x0, x7
@@ -113,8 +112,7 @@ ENTRY(copyinstr)
 	sub	x2, x2, #1	/* len-- */
 	cbnz	x2, 1b
 
-2:	EXIT_USER_ACCESS(w6)
-	SET_FAULT_HANDLER(xzr, x7) /* Clear the handler */
+2:	SET_FAULT_HANDLER(xzr, x7) /* Clear the handler */
 
 
 3:	cbz	x3, 4f		/* Check if done != NULL */


More information about the svn-src-head mailing list