From nobody Fri Jan 20 02:53:05 2023 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 4NykZV1PFpz2v8xh; Fri, 20 Jan 2023 02:53:06 +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 4NykZV0mYxz3l75; Fri, 20 Jan 2023 02:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674183186; 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=bSWmR+qFmWfEwEF8BXelR36msw9UZ2zpDxvOSjNABTQ=; b=h9NZ6VNRHuwCt4H+0vq2gBEeNJfe+5m1TuT2ns88/UdC1RU1CkprqipkiH6MuChQQBq4oW Kyx/o5x0L7KPQjqF1grNEP/aaSbQij8UryWdDEJfXvwRXSTnUE24hMptrigOKwymiCsM+q 1bzcR5BndF7jKyDnJdx4E9HbIohmMC3tCLKfLJBp5U9X7/64CZoy3NNUIaA3HLQ7aivdWe SB2LHg62ZsyT0VckH0qFYJGbjpljPcE/JZUI1ELfXWkyGVngbnT43NpslWyNTOhRt30m24 xt29hoXQsZBgmecJcyZyUJMiELIe2eGseUj9c3wg4qrOIXJFVtuR0HTed2Y3VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674183186; 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=bSWmR+qFmWfEwEF8BXelR36msw9UZ2zpDxvOSjNABTQ=; b=LhP6R/jWDLrueWxeMmpakwbSaByM7Q823LtVQbLJzye9lhdqnrt4ao8aFWHbHScE75cJGl mJWH94fYwQYxpWvc+NybP5KM8V/BOu6FXIJG1Rmmv2lSRaEU+td4UzfcXBebWYkexZFrXT Y9OBpKLy0Wnz0iIurusy3QAvXV0gNbtacFlG4UZJ0y8w6yBmTg6sLg6IvG4WAPqYm9hra7 6VbdpNK82zIr3V20o8SfR6La6uAl3g026C69dykQWdhAiVA+PzOg370wodL0BN07Q2bmhD ehgxbDsW5SH0VXQBZhyp3xd8XFIZaEq3lv7OKHHcppGLrXcS1F9nQaru+8HmLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674183186; a=rsa-sha256; cv=none; b=HYsyat+kDMk4dnU6EDmF9G//7wnOnGYXCBhvDKZfllyIgdBogT2p4NxwkP3S8uoB69e66U i5cx2jkJyRGBizUG1MxlwN+GQWKjLEu0PrEf86m8vFRwfFaH9ybjhsY5/iDdgkZhZOhkl0 Zir6SUoZrvXYMAa9hf6RsQkOzlKRWhrqpnAhnNZLa0MS5930BiDcol6aCB43TlhiynahZL t+PAaP+xn9ZLyjBVShQ2Gr0bBMdXMK/9sSe4QWrAxeRhYTlGk68Bw3DpyHf5U7ltuJ+Fwo BiRQyIp8jp2hEkJY+j7PHwERJ0piPE+s+AyZVOpfe98rDo3ANnrrv2af55FNmg== 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 4NykZT6z5CzFPV; Fri, 20 Jan 2023 02:53:05 +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 30K2r5Da097311; Fri, 20 Jan 2023 02:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K2r5Fx097310; Fri, 20 Jan 2023 02:53:05 GMT (envelope-from git) Date: Fri, 20 Jan 2023 02:53:05 GMT Message-Id: <202301200253.30K2r5Fx097310@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: e5c30ac93055 - main - vmstat: fix overflow of interrupt name buffer 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: e5c30ac93055e708e26e075937263608b3eeb17d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c30ac93055e708e26e075937263608b3eeb17d commit e5c30ac93055e708e26e075937263608b3eeb17d Author: Elliott Mitchell AuthorDate: 2022-11-26 16:21:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 02:51:13 +0000 vmstat: fix overflow of interrupt name buffer sysctl() provides a count of number of bytes in the buffer. That is the actual buffer length. Whereas looking for an interrupt entry with an empty name could terminate too early, or overflow the end of the buffer. The overflow will occur if the table of interrupt names is full. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36628 --- 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 07988da9d99d..d007d4f6098f 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;