From nobody Mon Feb 16 15:44:25 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 4fF6X94XYBz6RxY4 for ; Mon, 16 Feb 2026 15:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6X91pSlz4PQb for ; Mon, 16 Feb 2026 15:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256665; 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=5NAxG6K/bKIJk5o747hROuuzaDbxWwIsJQrkGkwDVV0=; b=FofcMQ5HD/OM5XtIWHmtH3nFc13wofQtzH/IeiTTXncNMf0Hy62+hQ7ENvraVMHAoLD42m qUR0wg38Dy64LX2ZuUrH40m/YFTtMSYsZtG/yFxLlOHEz5mPVg27ybisoGfUjLsFicvspA R71ks4f/M1LU5qSmh5YWMKU+B7rKJr+wC9vjdlD5Zee4Pz8/frtDh+S0Srg51HWVe4xyGq aG+gv8h9E47RPR6dHQT1kaGT/fu2XjqTSNVBxctl6IM9UCu7osunhPDZzLGz5jeTa1vlPQ 3DERIiK0LbnPd1szy3fyAkyVz9NpEyEOWfXzWJuS1xTQWEbfDR7EDfTj0wh/yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256665; a=rsa-sha256; cv=none; b=CQvz9xUme252VDhggOpb2+PkPCFCNTZJFdN0ApiqwiKeWkvRXmaBT8QXPmMPY/0oF5gXHi TNdRgHGYAyTvNDB2Nx9Ze97MlNhzr90SprWzqnbsk23HuFtKhbUaFPDRjNZuFwvOVFwAHH aOX1UdAltot35dTe9713iVsQry+CP0Kia5dw4hlvqVbeZG6aQdR8rvHU1vQZDPA1rbEz4/ ntDQUtT3zfYuK9wo3XXa2zab2xjINWT4hFAFtyCrWthA+zq9PSeSkAxdV2Q4B66tiQ4c3d z9kOuDwXTUp2Xsux9ys6cJo5zZtzLPpgC0mKwDwCbQDe0ptWxnZyobd3sED9aw== 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=1771256665; 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=5NAxG6K/bKIJk5o747hROuuzaDbxWwIsJQrkGkwDVV0=; b=V5d0pMX1x64kGfWZ2xGoUWc4vBsE5r7PUcxpuZw6hUP7ge2sLkxF1ToFUELsSZCYmUravt DQ5CuOPxzsGgGMUDTafgnpe1avbpsf/k21BbcHrad3Db6pUcyBozyv5RLvLTg1qwJvFsHa /bRthIGXSTrvLM20c/JgdEomt2ZiOb/1pUbkr2Kw9qa3VGGNLmjcQnB1ucXQieMa+ApaWK c4+Kx4lwS2iDbIQZ975UmAQU1cBLTOgunswd1R0+kUMX6HgXtejzPUSJlj8thqq2K+Z6JM KTZgl6OWjKtY7rKDAlHTqGJN0RbYHzh5+K6Y/ZGyplOTEEpl7c8FQVfY8lsFaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6X91Dr1zTsQ for ; Mon, 16 Feb 2026 15:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 93fe6d43f8ed - stable/15 - cpucontrol: Be more strict with input validation 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 93fe6d43f8ed01b9e1f98ce589b93a930ba0a540 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:25 +0000 Message-Id: <69933b59.1fcb4.435c4732@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=93fe6d43f8ed01b9e1f98ce589b93a930ba0a540 commit 93fe6d43f8ed01b9e1f98ce589b93a930ba0a540 Author: Mark Johnston AuthorDate: 2026-01-28 16:31:41 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:42:11 +0000 cpucontrol: Be more strict with input validation Avoid truncating 32-bit values. This would have saved me a bit of time when I was looking at a cpuid leaf on my system and typed 0x80000001f instead of 0x8000001f. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54919 (cherry picked from commit 59bbb62b6078afffd1c182b63d43934248289675) --- usr.sbin/cpucontrol/cpucontrol.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c index 9cc3968de01d..52e74a83b85b 100644 --- a/usr.sbin/cpucontrol/cpucontrol.c +++ b/usr.sbin/cpucontrol/cpucontrol.c @@ -36,7 +36,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -112,6 +114,21 @@ usage(void) exit(EX_USAGE); } +static uint32_t +strtouint32(const char *str, char **endptr, int base) +{ + uintmax_t val; + + errno = 0; + val = strtoumax(str, endptr, base); + if (*str == '\0' || errno == ERANGE || val > UINT32_MAX) { + WARNX(0, "invalid operand: %s", str); + exit(EX_USAGE); + /* NOTREACHED */ + } + return ((uint32_t)val); +} + static int do_cpuid(const char *cmdarg, const char *dev) { @@ -123,7 +140,7 @@ do_cpuid(const char *cmdarg, const char *dev) assert(cmdarg != NULL); assert(dev != NULL); - level = strtoul(cmdarg, &endptr, 16); + level = strtouint32(cmdarg, &endptr, 16); if (*cmdarg == '\0' || *endptr != '\0') { WARNX(0, "incorrect operand: %s", cmdarg); usage(); @@ -162,7 +179,7 @@ do_cpuid_count(const char *cmdarg, const char *dev) assert(cmdarg != NULL); assert(dev != NULL); - level = strtoul(cmdarg, &endptr, 16); + level = strtouint32(cmdarg, &endptr, 16); if (*cmdarg == '\0' || *endptr == '\0') { WARNX(0, "incorrect or missing operand: %s", cmdarg); usage(); @@ -172,7 +189,7 @@ do_cpuid_count(const char *cmdarg, const char *dev) cmdarg1 = strstr(endptr, ","); /* ... and skip past it */ cmdarg1 += 1; - level_type = strtoul(cmdarg1, &endptr1, 16); + level_type = strtouint32(cmdarg1, &endptr1, 16); if (*cmdarg1 == '\0' || *endptr1 != '\0') { WARNX(0, "incorrect or missing operand: %s", cmdarg); usage(); @@ -228,7 +245,7 @@ do_msr(const char *cmdarg, const char *dev) /* * Parse command string. */ - msr = strtoul(cmdarg, &endptr, 16); + msr = strtouint32(cmdarg, &endptr, 16); switch (*endptr) { case '\0': op = OP_READ;