aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2021-05-25 22:19:44 +0000
committerMark Johnston <markj@FreeBSD.org>2021-05-26 19:31:50 +0000
commitf32130a1955e40476fc3c15e4d32e80e32b7c42c (patch)
tree41e6e1faf5ec902d8343f988863d937fdf4ba73d
parentc690965773831b46f84a242b417372fc499302b4 (diff)
amd64/linux*: add required header to get the constant value
Otherwise asm silently interpret it as the external global symbol. Approved by: so Security: FreeBSD-SA-21:11.smap Security: CVE-2021-29628 Reported by: bz Sponsored by: The FreeBSD Foundation Fixes: 91aae953cb80 (cherry picked from commit a59f0285377aa3d61cccda64e9ade126ecb3d2d9) (cherry picked from commit 876ffe28796c4a81fbedcdaa4d7e4527cd1c79c5)
-rw-r--r--sys/amd64/linux/linux_support.s1
-rw-r--r--sys/amd64/linux32/linux32_support.s1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/amd64/linux/linux_support.s b/sys/amd64/linux/linux_support.s
index 2de778e151bf..4826cbed0ef2 100644
--- a/sys/amd64/linux/linux_support.s
+++ b/sys/amd64/linux/linux_support.s
@@ -30,6 +30,7 @@
#include "linux_assym.h" /* system definitions */
#include <machine/asmacros.h> /* miscellaneous asm macros */
+#include <machine/specialreg.h>
#include "assym.inc"
diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.s
index 7ff3e2293f6e..e035b4f156b4 100644
--- a/sys/amd64/linux32/linux32_support.s
+++ b/sys/amd64/linux32/linux32_support.s
@@ -30,6 +30,7 @@
#include "linux32_assym.h" /* system definitions */
#include <machine/asmacros.h> /* miscellaneous asm macros */
+#include <machine/specialreg.h>
#include "assym.inc"