From nobody Wed Mar 05 00:51:47 2025 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 4Z6vBq4l91z5p3nJ; Wed, 05 Mar 2025 00:51:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6vBq3R9Fz3C6k; Wed, 05 Mar 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741135907; 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=VPDfDeLnwMBeEDk26Qm5SdZ1RN/5tFcFEIGki1AAcT0=; b=mElJ/pwXpTLaxrCqP4M9LpFSBoQ0eYMV8QN0Pw86hiUKwAPnFDBPgqD9HhPS28EOsJNQjw o7uGja5Ba3Juz+S3eU0GunJ0g8FEsSNr3y4w392WaibMV45ozPnxXW5yzFWmL5vuh9FknU rHbMxIcPZmHK0DdbFepi5MLhQvCtZHuMq5m+7iu5G4ngHkIuIV9i+g7I6lVfvWxW18qjqE 3rH2rlr+0CUC5NA2FAhA7v5akaEPo9BFU+YgX/dbJS4JUukvlpUR/8ujfAgNAo3D66lYJ7 48xF+Urp22dQSMaV0k9qe0yuPsJmLNQ7I7F8NOm7aqa95iOL5iI+l/tRJELqFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741135907; a=rsa-sha256; cv=none; b=kHxFZsftdWgXqZ59dgst2bSFT8+5kZVKIeCv0h8GPWwWa1FN178tEOn18JUt5LZdijq+G5 0qIjzkiSa7UCf3xV7Lrskq5wetkAvU9nbwabwSzeSRVWhVVIcas3YbwgmUPWCtwQq17HP/ HPXsNwi72q7pUjgb0VY4F3vBSN7xlKzXNlj59QMGnUsqX03DL7XbdXopSix2IrgHCKmQrD TNPs9Fh4jRqU0PSisbNAMjGqSW2TJZFubYDGfLbd+/fCYoR7FVxI34EU5jLGBTaFs6c8Qu LBIH7kuylR7UnEGN1u7Fg9eFtjsUfRS9klMSucZ3dB7mir6kyOJdzUTgegSyhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741135907; 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=VPDfDeLnwMBeEDk26Qm5SdZ1RN/5tFcFEIGki1AAcT0=; b=xQFvEaEtA4WJKoo2DT/RrZMadDkoK+RSdzHAO/Mr2FRDmdUt8vbFqW3WILCmB7XDsAXrKv G583cjf/7NUYiP3ub03CdBFFVM+zk4amagvFeoageX13AyLYkbGveFs4gEQCjyL6gjCeSx yDQZanguw37bI0DSrEnVxNoSjVaTFJEaYFLqRapmQ54GNuzpAFLqXDGVlFsNOaaK900m2k ZzPTHym1SBOpU6XXBbGSYuJMxKMGLTdQ3DkDmVheo6rSRzO6uKnD4giLNjHp+JR8krX6LL pxVI6W9ozfrPeDJe1V18tmLJuFvLPFKRsRTevKdcCu4wAln2V+zoXL5xQOVZag== 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 4Z6vBq2sNMzj2W; Wed, 05 Mar 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5250pllQ074441; Wed, 5 Mar 2025 00:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5250pliV074438; Wed, 5 Mar 2025 00:51:47 GMT (envelope-from git) Date: Wed, 5 Mar 2025 00:51:47 GMT Message-Id: <202503050051.5250pliV074438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8ebb0781f536 - stable/14 - acpidump: do not use pointer arithmetic to check for overflow 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ebb0781f536be8805975a75bea9be1fa453f1bd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ebb0781f536be8805975a75bea9be1fa453f1bd commit 8ebb0781f536be8805975a75bea9be1fa453f1bd Author: Konstantin Belousov AuthorDate: 2025-02-26 05:24:30 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-05 00:51:29 +0000 acpidump: do not use pointer arithmetic to check for overflow PR: 204945 (cherry picked from commit 8c108dccd7f878ad44aaef1f5bfb5622666bd09a) --- usr.sbin/acpi/acpidump/acpi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 31c3045ab6ea..385a0a3c36fd 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1222,13 +1222,14 @@ acpi_handle_tcpa(ACPI_TABLE_HEADER *sdp) vend = vaddr + len; while (vaddr != NULL) { - if ((vaddr + sizeof(struct TCPAevent) >= vend)|| - (vaddr + sizeof(struct TCPAevent) < vaddr)) + if ((uintptr_t)vaddr + sizeof(struct TCPAevent) >= + (uintptr_t)vend || (uintptr_t)vaddr + sizeof( + struct TCPAevent) < (uintptr_t)vaddr) break; event = (struct TCPAevent *)(void *)vaddr; - if (vaddr + event->event_size >= vend) + if ((uintptr_t)vaddr + event->event_size >= (uintptr_t)vend) break; - if (vaddr + event->event_size < vaddr) + if ((uintptr_t)vaddr + event->event_size < (uintptr_t)vaddr) break; if (event->event_type == 0 && event->event_size == 0) break;