From nobody Tue Jun 9 19:19:53 2026 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 4gZdyf02Ksz6gVTM for ; Tue, 09 Jun 2026 19:19:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZdyd3z2Sz3Qbg for ; Tue, 09 Jun 2026 19:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781032793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OVLD569+lxtbae578ncr4WDt6z6O8DwVLHoDj7eYAHs=; b=cwRZShZaNdPO5rz/oHYnTg5WGxCdGyVVWbZgEza00WyMc/RcQe6IIT5M2MoNgGPNVNyscc PjkAon4TrfFgsG6f73cZknowbmf5fXeGu5y5UB74rSQVZl5F5SJFjFULK76JYS0kpFwEPQ UMFhDVT1kDKxGI2leH3gkdZ7shaEhGa7rxsdLkpk9octlQzx9DOMpvbG9kLt2xIkRueuKE ryrelkdodj7LfFex0SFGNj7kb1kyOydLE/85XQU/cO9+90I0qU3DyHQrUSTWCDEFFF9zOr uJiu6a/rogXjHB+4+sF7mAXZz9B8UwRKAeTpSo7VBgkVkJKRbMwRJla7jpUvqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781032793; a=rsa-sha256; cv=none; b=dZgRGj2SJzRCi8OgIsl+jEmImyQFYQ5tWxQklgZ6X4r2O5VLSNSoyU0DdxRDl3FrkvcMuX bVq1W/M0Yaw0B/nvonzLUXSxmZ1I1B85lbXokXR0bg7bs3i408SPHbP6Oaq4/TN6YNhsbI 2thbD7J0gwVO+kaRSebwDHIUkyugcsH4lcyGz1jsrudYuUoQJ+SmRYnhudKBcZ+P+cXacA rqsikRjE2ER69TNbnC49/RSxz0hvGQbmiFS0U2IOOASvpFRDVbN4HpgHUcclbnxeHp1+C5 CtRbp+UmU1kYxMxHOTpyV9RrVKWOUI9XbfVOl1Eil/O5N4YY+0y8dUdObCoHww== 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=1781032793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OVLD569+lxtbae578ncr4WDt6z6O8DwVLHoDj7eYAHs=; b=gG0O75iBnACRYWlDfryvEECX0Flma3fK4Tz2TZVb4qJfTVl/y52+nUY2gBGuL7tKQeCRnl 3tbqdinjQ6pzlA5WHw1w5r29n6m+IRdYNs/n+Pg6/UpdOwvMU72r+nl5rXtvGjXxE7Z/1u ay5T92/1jGZRqNgaiuUlUm7nymmm4k+A0BgFoVi2d34iMkRPgXDhNhqzB6espbaTgmha6J CsZEQ7jN5VH/9TthMltZCMJSRw2humifwd1PkiYWyx7mI7BW4GDvseGJk57WR4KyVWo4rw 8In93Vnop9ld4vyQe/iDXXqKuSKlb1KAkmt9WXD6CUu8xfPOncU/qHnVvP6c+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZdyd3VvRzny8 for ; Tue, 09 Jun 2026 19:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 19:19:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Mark Johnston Subject: git: f4cf977dfe92 - releng/15.0 - vt: Avoid integer overflow in CONS_HISTORY ioctl 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f4cf977dfe9295dd0824ac9ecf041d9974c896cf Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 19:19:53 +0000 Message-Id: <6a286759.3ef39.5e311cec@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f4cf977dfe9295dd0824ac9ecf041d9974c896cf commit f4cf977dfe9295dd0824ac9ecf041d9974c896cf Author: Ed Maste AuthorDate: 2026-05-26 16:19:47 +0000 Commit: Mark Johnston CommitDate: 2026-06-08 15:39:32 +0000 vt: Avoid integer overflow in CONS_HISTORY ioctl Approved by: so Security: FreeBSD-SA-26:34.vt Security: CVE-2026-49416 Reviewed by: markj, vexeduxr Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57250 (cherry picked from commit 0ae946e7223df5ef3f7980af1d774d7f593f6421) (cherry picked from commit deaaddf1d3c4283649945553ad7e3208c8424308) --- sys/dev/vt/vt_buf.c | 9 ++++----- sys/dev/vt/vt_core.c | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c index e1e4ebc23491..43657fcecbdc 100644 --- a/sys/dev/vt/vt_buf.c +++ b/sys/dev/vt/vt_buf.c @@ -499,7 +499,6 @@ vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, unsigned int history_size) { term_char_t *old, *new, **rows, **oldrows, **copyrows, *row, *oldrow; unsigned int w, h, c, r, old_history_size; - size_t bufsize, rowssize; int history_full; const teken_attr_t *a; term_char_t ch; @@ -510,10 +509,10 @@ vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, unsigned int history_size) history_size = MAX(history_size, p->tp_row); /* Allocate new buffer. */ - bufsize = history_size * p->tp_col * sizeof(term_char_t); - new = malloc(bufsize, M_VTBUF, M_WAITOK | M_ZERO); - rowssize = history_size * sizeof(term_pos_t *); - rows = malloc(rowssize, M_VTBUF, M_WAITOK | M_ZERO); + new = mallocarray(history_size, p->tp_col * sizeof(term_char_t), + M_VTBUF, M_WAITOK | M_ZERO); + rows = mallocarray(history_size, sizeof(term_pos_t *), M_VTBUF, + M_WAITOK | M_ZERO); /* Toggle it. */ VTBUF_LOCK(vb); diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index b51ef6766de4..7d4a79b4e4a5 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -2766,8 +2767,9 @@ skip_thunk: /* XXX */ return (0); case CONS_HISTORY: - if (*(int *)data < 0) - return EINVAL; + if (*(int *)data < 0 || + *(int *)data > UINT_MAX / USHRT_MAX / sizeof(term_char_t)) + return (EINVAL); if (*(int *)data != vw->vw_buf.vb_history_size) vtbuf_sethistory_size(&vw->vw_buf, *(int *)data); return (0);