From nobody Mon Jun 23 06:27:40 2025 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 4bQdRd301sz5yrQl; Mon, 23 Jun 2025 06: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 4bQdRc5zb2z3g4N; Mon, 23 Jun 2025 06:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750660060; 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=/VFHfCtUfbiVVNQm47M+6FzABW/L08iZ0dtv2HDfhdc=; b=EdcVW4VFr0f4aLPDEs0GIXYrq7Vrwc3OVukrOImR9o5D49Yt07KiSPDhzBogQVACx1ctJI w/21T09tQ3RiAKfHB02zv9G8nDYFnaWUgL6M70dMCkc4A5+r0LLhJZggVndCgjtSBWA8FN om+FRwIIoOgqcvk4N2hrpB2CNf0M5TnDxj6zw4BsSiLEmQ8NWkYjkmDI4KiLjqc1O2qxGZ BCEzYp2DObOGdWwJTP5D/Q/EOH9Etr+wPcUObRj5kN92PNe2q22z4MB8p4/erlSMON266d kjwbBWTjYF756pk87XUdp99lLevmcYX4Zqmk3PxlbH94Djzn1YhEfILBmKpEzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750660060; 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=/VFHfCtUfbiVVNQm47M+6FzABW/L08iZ0dtv2HDfhdc=; b=n3lGZs//ci5GWAJeYnmOJllbYap6h55bv0q0Xc9i22fqQEeXckT23QVVyO8qPDsnc/BCo/ prQsSMJgOGOJpvJpJdwsfG/98T6MEaEXFcM2ck01UxZI7Mnf8NhWUR+mNFkFHDbCVa4goE mzFfQR940gz/JFtSploY4XfQiYQ4l93++SSrximkt55Dx/CB2VQnblu5HomxTb0Rzysgi3 aSE7VSiN0gm84fr+3eDhwJow0WPZ6FsqEIM2i7tCT4Z3BQDSbOmtFker1g/obA16pHr+Xw PHdF7l/qRgRkr/xSjydAzCOI8rqVLwrLNpkevV0QtVTQSL6ksjRB9v9XDmRMiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750660060; a=rsa-sha256; cv=none; b=KVBgKTe0myFoJuo78qXztXGXDXnJCIUZjkTb361eu+ct2+1UQv736k7ziQaz6qTpYCPknJ pJdlTtMaqTrJqfmR9m8rZnUOrcRQXQsB1ELi083g7ZgdKVgX4HFXuSJtZVwp2YTqA4Y9Vt eJCfKhZcaAJtwliY+aIcuNtnT1tFQW8pOAXSlEY1d4x8QZJIRbp7x+7/U6cIZlStvSz3CN rOtfM4SiXoafycYmAF0toCOAIs6n+RKZslhYC2ELQSVOJaaNKnrR8ptu28xJikbBPjR4ee VKrBh/fBIXE9xYGRdS+OCm82sfY+vOysHHj+Dph1tuX+0IIJLHl/zGsvuIdaMQ== 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 4bQdRc5bSxzrY9; Mon, 23 Jun 2025 06:27:40 +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 55N6Rea0017737; Mon, 23 Jun 2025 06:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N6RegL017734; Mon, 23 Jun 2025 06:27:40 GMT (envelope-from git) Date: Mon, 23 Jun 2025 06:27:40 GMT Message-Id: <202506230627.55N6RegL017734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 3146c8fa1969 - main - vt_fb: fix KASSERTs 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3146c8fa1969349431467ff357af3be12e49346f Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=3146c8fa1969349431467ff357af3be12e49346f commit 3146c8fa1969349431467ff357af3be12e49346f Author: Ahmad Khalifa AuthorDate: 2025-06-23 04:38:50 +0000 Commit: Ahmad Khalifa CommitDate: 2025-06-23 06:23:21 +0000 vt_fb: fix KASSERTs Make sure there is enough room to write more than one byte. Reviewed by: manu, imp Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D50842 --- sys/dev/vt/hw/fb/vt_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c index 5031ab946203..151129208f27 100644 --- a/sys/dev/vt/hw/fb/vt_fb.c +++ b/sys/dev/vt/hw/fb/vt_fb.c @@ -74,7 +74,7 @@ static void vt_fb_mem_wr2(struct fb_info *sc, uint32_t o, uint16_t v) { - KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o)); + KASSERT((o + 1 < sc->fb_size), ("Offset %#08x out of fb size", o + 1)); *(uint16_t *)(sc->fb_vbase + o) = v; } @@ -82,7 +82,7 @@ static void vt_fb_mem_wr4(struct fb_info *sc, uint32_t o, uint32_t v) { - KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o)); + KASSERT((o + 3 < sc->fb_size), ("Offset %#08x out of fb size", o + 3)); *(uint32_t *)(sc->fb_vbase + o) = v; }