From nobody Sun Feb 13 18:27:20 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AEE84194AB9B; Sun, 13 Feb 2022 18:27:20 +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 4JxbRr4N6bz4hm6; Sun, 13 Feb 2022 18:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644776840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOrRUs8P338KssR+XW/QUmpMaKcXKgtk3220TmOxyrE=; b=Awr19FdJWOBDouBCaC15RxMIsd97GVQDWeGfoaijlRA6rqpaGfLAQdMX/9FSPY6uyLvb43 N3BdWys9GGW+lsbTZfePubQYVwZPhg7t2jT67zjEf9kpf/w95bF+vFQZYen07198dCkXz4 5EQfR4xgD232OTvfw4SkbKEougVaiCj3l/j7xUWWttTkyk1hnn2p90piNyK4cescGb4glm +uR4/zjT70yQDXwOmXyYCYLSRdfgz8iFOZa0Riyce2zhC5a4pHRw3mhWCLFWjfD+lSVWcY KcUddCHMvCAikeylkDvuub6XPWMmLvTbfSUTSTDfyIpSI6q2pVelYhPkoKZVNg== 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 776361FBFE; Sun, 13 Feb 2022 18:27:20 +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 21DIRKHC002307; Sun, 13 Feb 2022 18:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DIRKmj002306; Sun, 13 Feb 2022 18:27:20 GMT (envelope-from git) Date: Sun, 13 Feb 2022 18:27:20 GMT Message-Id: <202202131827.21DIRKmj002306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 5740196b0d68 - stable/12 - APEI: Make sure event data fit into the buffer. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5740196b0d688285ab55c24fbeb60ca69fe76703 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644776840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOrRUs8P338KssR+XW/QUmpMaKcXKgtk3220TmOxyrE=; b=GhJkejNrOYYqZQ7vb4qbgMejefjjLLVNbAnj+AamRzXKomzW4F1Sdm31mmS/nKDdaSDAmB 9cMgsV6PAyDFWQpqWBjKl7KD9e1lsJT77pVWFJIMXMaZrmXnr9UPyY3s1iotxZSwZ6T2LR bn370dkaHnfuP3FcvfI91jjftK1v5tipALbb3OoR3wmio1HF4vsUa2FTmeaTSMZTCkLBHv RihRSdRox33kHpuYldsDAsjAb8Pic+5T8GNm9H4oSIllPqb2jVpBsevbg9tJFHpcyToc9x DfOdw70s7ilCut62AXw8R8UCPU/hfg6rxYz65SymPdVoe3o7MMTk/yE+LYopiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644776840; a=rsa-sha256; cv=none; b=RdHVQhIlukDChKjWaj0a/lJHXma7gmirhvB+fPILtU596+YBJ1QD75/+P+wHvQceQaHQgJ xIXoeqX0h7ZYqEWGWB00QTYxEgrVl+4vdnQS/BZVsF6nrIA8H/QTqor/uHrOYNCsJJ2J11 QVFenQCPM1lTWhofdOE4fygYGmj7dUFg6tbtvzWl1lsSJ2JdRkrsv8jnsgGlH+3KAEiJjO vRyJnzP2J1pi9t9fvXF6hcLYqo+8sro/dXsZzRbbC5B0kvWEVbSzBLuEfLrZKAR7m0/GBS RAG2CRx3qnMBInSPyxE725dk1+NoQr2MreC/ntLKZvzE1Y6V/r7sjHYAV5R8Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=5740196b0d688285ab55c24fbeb60ca69fe76703 commit 5740196b0d688285ab55c24fbeb60ca69fe76703 Author: Alexander Motin AuthorDate: 2022-02-03 20:18:31 +0000 Commit: Alexander Motin CommitDate: 2022-02-13 18:27:15 +0000 APEI: Make sure event data fit into the buffer. There seem to be systems returning some garbage here. I still don't know why, but at least I hope this check fix indefinite printf loop. MFC after: 2 weeks (cherry picked from commit 3b248a2113829e43c382f5e2b1f85c626c01f024) --- sys/dev/acpica/acpi_apei.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c index 75e5096a76e1..fe3f07bab239 100644 --- a/sys/dev/acpica/acpi_apei.c +++ b/sys/dev/acpica/acpi_apei.c @@ -371,8 +371,9 @@ apei_ge_handler(struct apei_ge *ge, bool copy) uint8_t *buf = copy ? ge->copybuf : ge->buf; ACPI_HEST_GENERIC_STATUS *ges = (ACPI_HEST_GENERIC_STATUS *)buf; ACPI_HEST_GENERIC_DATA *ged; + size_t off, len; uint32_t sev; - int i, c, off; + int i, c; if (ges == NULL || ges->BlockStatus == 0) return (0); @@ -381,8 +382,11 @@ apei_ge_handler(struct apei_ge *ge, bool copy) sev = ges->ErrorSeverity; /* Process error entries. */ - for (off = i = 0; i < c && off + sizeof(*ged) <= ges->DataLength; i++) { + len = MIN(ge->v1.ErrorBlockLength - sizeof(*ges), ges->DataLength); + for (off = i = 0; i < c && off + sizeof(*ged) <= len; i++) { ged = (ACPI_HEST_GENERIC_DATA *)&buf[sizeof(*ges) + off]; + if ((uint64_t)GED_SIZE(ged) + ged->ErrorDataLength > len - off) + break; apei_ged_handler(ged); off += GED_SIZE(ged) + ged->ErrorDataLength; }