From nobody Wed Jan 28 17:47:16 2026 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 4f1V8j48K3z6QT3L for ; Wed, 28 Jan 2026 17:47:17 +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 4f1V8j1C3vz3Zsj for ; Wed, 28 Jan 2026 17:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769622437; 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=KZm1jBF0blgDqeBbuNvqFWG+pP99t6Aeh7oDfFJLmnw=; b=uAbd1ieklMYLjxrMPpN1H96iThvfa86jyiAWqqkOO5og61ziknljHILGjjE6Df4V8A81hb VUwcCtqv4HBrybjb3tlBOLpc+vW+ix59nIydh7e6Y0MwVVydXGr1BuGMnajlpBPOql/E8Z VT/1kXcBncTSXwpftEdTevRbaDcwOuo4/84A4F/qdhJSd1SXu9voLwohhy8GqRe+scyvSE Pglt+m+MlDfGhwWOx12VWmJxuTSAPhusaIDcqXdA673J1aNu2VAhUFMBuC7sbR1nSRAdGg Pwxf8aRLP5rJPzL7kyH1J2D/nIoXyWqRjtY9f2Dy+rHPEizHssLX9+dyMLjA2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769622437; 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=KZm1jBF0blgDqeBbuNvqFWG+pP99t6Aeh7oDfFJLmnw=; b=iflecXN9qhHsdqIqaHTYviUQMPuI5xe1h8glCfQEmrnFOkaA8wxhmR6UTKj0vqIAnDb84Y fi0gjnu9FEYN0+CvgUv/35AzFbIGM+r2SYp3UtO1nIywaoTaRFcJ1aoAC9IJY+ICnO65Y4 LJJiZavWulybiUoq3SsqiY/Xm0+d5PKsyRCOApcM5la1lNajaxG+y9pyhTarXDWxbYDMqR F8Mmd1atcLGD7iimGjj4bAhtqCipBr/TNZNfhFU7Za9OcA/XDEWV7VCKOrjKGJracIK1z/ 8RP3v8HnOrugKhTxap8ZKNxxMXV20CfB6VLymch1qKDBxM4R1BpEUXPafLrkcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769622437; a=rsa-sha256; cv=none; b=E/zPsVX47R7HwBFNFdRKM8cqyKfRzV0dB6hm5AyDAIKMgGxDDW3Dh2fEnc2PPdiv6qbk8C lb0azvHNpRo2kA6u2tBCkzlmcJwL3zbWjfyIN/M+guapW67zK+nyF8ry/BsWXomCnnz2KS oD1zvuTY7MiBhtsc82vL7E+lESNQjBfOsIz53bLvI7aA49EJMivWF7q3/htl8wv9zzic0i k4Zz7QFZZSi4o52aeka//sjVItFEhNkWSaG9pKUHwIe6rxlTDKJ3NzVYroA29kKY5O+SwE LAFxtsAQ1w5+PHDezwk1PjyoNUuqJXm/vmHbsPG+dtywTfoZY5K7dEJTi3kcQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f1V8j0HfBz12qH for ; Wed, 28 Jan 2026 17:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Jan 2026 17:47:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 59bbb62b6078 - main - cpucontrol: Be more strict with input validation 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59bbb62b6078afffd1c182b63d43934248289675 Auto-Submitted: auto-generated Date: Wed, 28 Jan 2026 17:47:16 +0000 Message-Id: <697a4ba4.3f304.44475f06@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=59bbb62b6078afffd1c182b63d43934248289675 commit 59bbb62b6078afffd1c182b63d43934248289675 Author: Mark Johnston AuthorDate: 2026-01-28 16:31:41 +0000 Commit: Mark Johnston CommitDate: 2026-01-28 17:47:02 +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 --- 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;