From nobody Sun Feb 13 18:27:01 2022 X-Original-To: dev-commits-src-all@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 519DA194A9B4; Sun, 13 Feb 2022 18:27:01 +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 4JxbRT1qgSz4hT8; Sun, 13 Feb 2022 18:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644776821; 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=DTol/PuD60aDCsHNyQE2PvpKsYsL3N89qIY5ouJ6RC0=; b=UPic+FDDv/a+mOfxzE7BTt5OjB3awmRuYI1jEf1mFPP2K0W8r3T52JLK2HEBDxM6Z574qU 9Yk8VHluNwCHR4LL60IRxX4nSh3l2m/8gmGOwsJRd7BOzOtEiOsZxnZTuANb0/NBBTBV/6 9uK/7yfoI1dRmd0hu5HoAKcS3de+uubt42XoBKfwv9DvDIwetBPrec7JVogXNVoCUgOUAt vHeCgbD7IvNv41v8KDEO5O6+G8/vWeWkROz98izaPATWNkfwT1W6PltJ/6IY9nPBS5yUKJ ddHXtXAgoVCheQ+g8SReUFQx9XeeImOufEcvzOzVLh2FP9LShd6rqFl8iTb/NQ== 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 1E6761FF9D; Sun, 13 Feb 2022 18:27:01 +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 21DIR1YY002174; Sun, 13 Feb 2022 18:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DIR1Ef002173; Sun, 13 Feb 2022 18:27:01 GMT (envelope-from git) Date: Sun, 13 Feb 2022 18:27:01 GMT Message-Id: <202202131827.21DIR1Ef002173@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: 376fd49ae3b9 - stable/13 - APEI: Make sure event data fit into the buffer. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 376fd49ae3b9f07e122a3479f65c9414b38d7bae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644776821; 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=DTol/PuD60aDCsHNyQE2PvpKsYsL3N89qIY5ouJ6RC0=; b=xrVwUz61qQBQB8u/rtJJUQUwG4NeEqAsSjd8Rr3MsFVKiIoNczTCO3ZncDo9/ZYI+IS58z 3ddxCAMVvTy+C8sc+OwpnfSHf/fxc6GKHygc4ZF9ScIHOfhpXYNbZLVgl5G8qojSvqu19p gutvqwqUos0X7sX19Sp0OyRtHPkXZPpsLWhXmmhld4BerhRElKujuwq6KjikDkObX5U8EW 4c1eJW1yKydwGwACbeWughwb5cQk7or8pIgqxh6hTCqbRIe+ecEOqGUi6VNMj5zWCT7TIL 9yq/61RfN5o8pr1v3x8kxSTvjxLsl+ZF1+4jTysPdV1JBtqNdmzQ0U5ntwZhqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644776821; a=rsa-sha256; cv=none; b=cFx7eR1ev8KNZLg10U81bOUekOYFfXrxuWIbpqHWzkrvG5D6+0dXwDyE3ZvJb0NO7JpDyR eKZYijaNSBA6sbLxEteIusn3PKQVQdIyvWg+2DkqFN88RFCwj4XqajrTqyp3vSANqaIXku oxIb7PwcBa93eygKL+4djjzz0eSq1hh5C+XDSreOWu/rEoaZTnJCNmAn04TklmDYssRnCF I+z0X+9kgRyskZd6WARA6AAoNvqWz0HHGxHl0vrHPhki8VP1zF4ugQX7ExmQjXHeY+Qx11 8jaOl50zeOh49KlfcBlSL9sUffK+QWr2/JM0pcHUza0lSnyi+Jp+bQR8s/q93g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=376fd49ae3b9f07e122a3479f65c9414b38d7bae commit 376fd49ae3b9f07e122a3479f65c9414b38d7bae Author: Alexander Motin AuthorDate: 2022-02-03 20:18:31 +0000 Commit: Alexander Motin CommitDate: 2022-02-13 18:26:55 +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 c957959317ce..35bab30a68f1 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; }