Date: Wed, 26 May 2021 20:38:21 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: bc74f783f9af - releng/12.2 - amd64/linux*: add required header to get the constant value Message-ID: <202105262038.14QKcLj4055001@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/12.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc74f783f9af4ae611abeb79533a18c274b87005 commit bc74f783f9af4ae611abeb79533a18c274b87005 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-05-25 22:19:44 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-05-26 19:38:41 +0000 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) --- sys/amd64/linux/linux_support.s | 1 + sys/amd64/linux32/linux32_support.s | 1 + 2 files changed, 2 insertions(+) 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105262038.14QKcLj4055001>