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:38:41 +0000
commitbc74f783f9af4ae611abeb79533a18c274b87005 (patch)
treea5db7ea976f9540f79a4882463756ac1038be71c
parentbb4435255df53118082b3567db6da100962b3822 (diff)
downloadsrc-bc74f783f9af4ae611abeb79533a18c274b87005.tar.gz
src-bc74f783f9af4ae611abeb79533a18c274b87005.zip
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 b25bb77861640456a77fbf6f34cac4a3b69f0e5f)
-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"