From nobody Wed Feb 26 05:27:39 2025 X-Original-To: dev-commits-src-main@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 4Z2jfP11ZRz5pJx0; Wed, 26 Feb 2025 05:27:41 +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 4Z2jfM5Fhnz3wFZ; Wed, 26 Feb 2025 05:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740547659; 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=S29OIn/zb5+nFOQb6XDP5z+yyX5Fl5B21koqCpab4go=; b=R70GdxaQLGeaZWlfXtaSNx12HQyX6fvbQG7RCtmdjH0W/fQm/UdgZUDyc7blDd+7zcK7hY Y+7kvGZm/KRDSuM45aOlGb1R2ewWVJMJlV9PWUaur4fmpdntpKoviGpQ7diDgk7zLDXNBT t6eQmCOxNKITL4g20yCngJjerNfqGWmhAHgPB+xnqEfTZx96yAJ2kX+p+fnWqOufxiYuks DjiUllB82b4MN1gjU0sFelpjkk+GZvxt0Xtfm8U1I84J09Oy3vfQ8rrC8h6CkOWgnZ1+1+ ucDUzlIZq47RbThmZpRpbtywzUwJy05rB7p5WZPbGHe5m4+j99524m0L3TZmqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740547659; a=rsa-sha256; cv=none; b=CpSfh3l3OW9+UlSSEqB8bl9ec03tC4vBQ18PoJ/nA+ciMusaU81/yRR5Yi0osuuXEim8oc dJFtVZy/0Powi/WO02GJl98EiU/KJAFJI563C9ZFM2dsBS53QfeuFAK0SR2RidYSuXWRtu BzXav1MdRWU9D0v+B5Yqs7cQfVQoHQtcMO8m1ne3pTgiR7DX08aa5yIBwH7f+bxJYa8YHK sMC5rj/EJW51CZFb4rRMYrK5+YK/u7r/WB54MA4f1FtGpSUAMU+FHNbuFU4D4iJ+Iir98S k2EUsCRtfNT1vjdxE1CHEyOU/s8VZ0yZqjzxKhuxQk84/bu0hdPCxsq2TKc4pA== 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=1740547659; 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=S29OIn/zb5+nFOQb6XDP5z+yyX5Fl5B21koqCpab4go=; b=OOjwtwJ5L6crCH7aB0tleBIdrg21gVUNRBnWuqxiQ9CsRbnzgEdu1dyKCKfb1N3+cuNXCU AqMdUDQJfXiYBfytvlRLUBcEYFwOm/kOlbS0kNY371SbM1J6P3XHg3ySJtxjvvJ3u3PPQI 6/Z69wiA6KIQOKbZZ32n042Vlwl6vSGp4LahzZfMnEWx5avhs8NWFeaCd8WI/6q/4+0XaK nzVTx8zf3iQfGj9f5QGYUkq0cbvFgPyyOLDYPJPrnzND7vdamosxDgJ5JIBbpuAkf7Mi9Y 2CzUwfZrUnSpfKWV7a/eB1RPuCV8nbW35sENuP+Nu4GoLL7uKBQILYffdm5fvw== 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 4Z2jfM1yWRzyc9; Wed, 26 Feb 2025 05:27:39 +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 51Q5Rdlj032644; Wed, 26 Feb 2025 05:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51Q5RdNt032641; Wed, 26 Feb 2025 05:27:39 GMT (envelope-from git) Date: Wed, 26 Feb 2025 05:27:39 GMT Message-Id: <202502260527.51Q5RdNt032641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8c108dccd7f8 - main - acpidump: do not use pointer arithmetic to check for overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8c108dccd7f878ad44aaef1f5bfb5622666bd09a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8c108dccd7f878ad44aaef1f5bfb5622666bd09a commit 8c108dccd7f878ad44aaef1f5bfb5622666bd09a Author: Konstantin Belousov AuthorDate: 2025-02-26 05:24:30 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-26 05:27:32 +0000 acpidump: do not use pointer arithmetic to check for overflow Pointer arithmetic overflow is UB. Convert to unsigned uintptr_t and do the check there. PR: 204945 Reported by: David Binderman Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 c9e2d5745d50..a8a3c953d72d 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;