From owner-dev-commits-src-branches@freebsd.org Wed May 26 20:38:25 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 125876458EA; Wed, 26 May 2021 20:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fr2pS58BPz4grk; Wed, 26 May 2021 20:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28A6D177A5; Wed, 26 May 2021 20:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14QKcLq2055002; Wed, 26 May 2021 20:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14QKcLj4055001; Wed, 26 May 2021 20:38:21 GMT (envelope-from git) Date: Wed, 26 May 2021 20:38:21 GMT Message-Id: <202105262038.14QKcLj4055001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bc74f783f9af - releng/12.2 - amd64/linux*: add required header to get the constant value MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.2 X-Git-Reftype: branch X-Git-Commit: bc74f783f9af4ae611abeb79533a18c274b87005 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 20:38:26 -0000 The branch releng/12.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc74f783f9af4ae611abeb79533a18c274b87005 commit bc74f783f9af4ae611abeb79533a18c274b87005 Author: Konstantin Belousov AuthorDate: 2021-05-25 22:19:44 +0000 Commit: Mark Johnston 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 /* miscellaneous asm macros */ +#include #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 /* miscellaneous asm macros */ +#include #include "assym.inc"