From nobody Sun Jan 22 09:19:25 2023 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 4P073K6rpmz315Br; Sun, 22 Jan 2023 09:19:25 +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 4P073K5nrBz3QPB; Sun, 22 Jan 2023 09:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379165; 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=5MtwckaplmF1ZH0OH4yviniG1NyaSSzgm4xOR35h3+c=; b=jSptx9TZW2UiMr+jl7VGR5xyoim+a12ZIUb3kJfZ7ul+Zlq+jfjNMymxe4SB9esPcSug29 nvxaky52xFiVvmjXyKOJ7lhBud1kkKxytqZuoEFXB/eF8EtRNVeDUhUdrQtKE+d/3Li47U q/SyMuupPvXdanO2eFjh6SBY3qaRlw5ZMzhcg0rM4juPsquWSL8FFI1wuvND/an1GvhQZm mtTkpkqY3eSZH6JRxnqE0YqRb0Th2bQEEN8v8QllFR9PMpHbm7SHJJl0I+ztjWOAMJVeh4 n0ggjZoQ+svkcBlkSmWC2rvRySC5NZujrTrSVSELfenqv3HVLMnJmyNI/Pz/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379165; 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=5MtwckaplmF1ZH0OH4yviniG1NyaSSzgm4xOR35h3+c=; b=CZzthFztMyjPLIesUjCppt2S3UvuaQMu1mYs/Dv4rKTQ9UqNtcqqECkVIXhl3LyXOeBXxV a3xxZ4Ir1Q/m904wjfAyDNz7lc3dFOpX6cDr6zUXfTCldCez7Z02a/hRCrkYjmDfZFuTLE /gbXfl/zGmAV2ovMeVJJ3L++csQJtZ+3PH5J3M/dcmoy0gAQh/6RMwV+HtEaEOLdeTzD2+ ZqfLw2n3l3vEKJZJ+bXHTHXqaaX/ZC4dz/4/ZWLRv1zLkn1cII6t4+27vSLvLlapbbewIM OHSITRY+QBw3wiz5MCjPhr491iEhqZTQ9h/UNwGCHRFBktKbqR5WaSnmb/ue9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674379165; a=rsa-sha256; cv=none; b=EPRvl5aL3Iwe+HMxAFJMYPxT1jJ1XurssDwJDaE1axy+5Y3DlfibHskGGHkJQQ5suXSzzU 0kincW396pPubitG1PbkrT2+sOUOJZEj4XNhcVZ9kp6pvzb+oBANjDd55FGkzF4PAjsOWz vX3YZI2D+krblzg4LYpSd7mdm2mc13z3L3XWe40iRfUn8DIO/uNXwPZvXLVv4JJmIOozEr 8OgO1JeS4sdx0k6oreLV2yYTLkR1PslBv+ho0Se6MS4MemhD1kULmCtvQolUocPVx5cwiV uUjBtRxcxEaZitkaPV/n7Urh3cqen2lMuaVYGrgyv3rtlmZKwg1EINTxDMGDag== 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 4P073K4cckzkg4; Sun, 22 Jan 2023 09:19:25 +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 30M9JPmV044405; Sun, 22 Jan 2023 09:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M9JPrf044404; Sun, 22 Jan 2023 09:19:25 GMT (envelope-from git) Date: Sun, 22 Jan 2023 09:19:25 GMT Message-Id: <202301220919.30M9JPrf044404@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: 74cbe4d7e55e - stable/13 - vmstat: fix overflow of interrupt name buffer 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 74cbe4d7e55e5fbdeb884aa44243178c6048af1f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=74cbe4d7e55e5fbdeb884aa44243178c6048af1f commit 74cbe4d7e55e5fbdeb884aa44243178c6048af1f Author: Elliott Mitchell AuthorDate: 2022-11-26 16:21:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-22 09:18:10 +0000 vmstat: fix overflow of interrupt name buffer (cherry picked from commit e5c30ac93055e708e26e075937263608b3eeb17d) --- usr.bin/vmstat/vmstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 9414855b2a68..b79fc8144d48 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1349,7 +1349,7 @@ dointr(unsigned int interval, int reps) /* Determine the length of the longest interrupt name */ intrname = intrnames; istrnamlen = strlen("interrupt"); - while(*intrname != '\0') { + while (intrname < intrnames + inamlen) { clen = strlen(intrname); if (clen > istrnamlen) istrnamlen = clen;