From nobody Mon Jan 12 17:18:43 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 4dqfH75kWbz6Nr37 for ; Mon, 12 Jan 2026 17:18:43 +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 4dqfH73zy1z40V7 for ; Mon, 12 Jan 2026 17:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238323; 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=4OGfeADSG4Qy8Y7mQm2jaBBXmFaYHz5odNq21tqRE64=; b=r0sdhwsTGbV7zAB4qvQI4aC6IlhDoGa6jWcrjTJCZi5PENkyoj/ZyyAiAtSQefp2adaODQ FifixKq77/E+nSQGSJO0s04SZ5M7WKmf+uNNBBfglasxLOItvDRO1IEKrrzTwXx/PP4bpm BlHdAZfJn55Xf3s2+Z23HFH73htd8nzmPVbXDDZV3Oeh4TsPMCdCBXmvgL96mTlsjChooX hUwRTWc2iRuvQrMjaz43Nk0pNZgidx8Gy0NM++7So9CX5j+zQUg9H+LEaTZII89SHE34ke xCEbhPDa7RgGpteAqRsk0CbIa8VqMHTs+clQKp9VXbJUCzfUyITk55zpKzkHZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768238323; 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=4OGfeADSG4Qy8Y7mQm2jaBBXmFaYHz5odNq21tqRE64=; b=j2eYY4ClT+YY5rOb7iL2g3RVDMXCj8mYzhf88dqjOkeX5GpNRwA7oiHHQeRt920j6cfIHl epzVEAT58jAG0AsamoN40rhCkNyX1cUvpsoMKd6neBTTTiWrIwxBorZC/jcdYokp2vqzIY sFV240GzE51Uo0qqGI2vpXkwW8TmyPY4PpBLYLL4UPdVVsuBUWWOBiDz2Ky9H7BIdVxPy/ O3heGLMFA0YfuCqcz+uTznsuC858SeOKD+gVo8AePWbK3DB/1a+aywFcjSr7Ijmls0npNy PeaR6qJpl5lr8EqVI7KSiz2cXaa0C2ct1s+p889hvQrT/NiRi7Bz6Zgj8W/+lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768238323; a=rsa-sha256; cv=none; b=k+GlLOCThd8PsaVQtwU0FKpLv/s099HfDuOPyVmZM2HA+XAnUXFhG/GmA9a8ZgLXNfrPg6 jMexWgDpkPyIUcfjkDcUgY74k6nVwwwh8+evsnMsfSIL6+G5gn+3999VfPvpZsxF1saE6c micjcTZCzG+5BBqlbH/UsON+en+Wwu07JRzcWU/e5qS4tAOqOTw7RKN6xAkIxf1c2H4olg tuP8RK/QQd8fwhyhfOlPoLX9hqFl8eZya6Qx26aTqqhrXLaC7BMR6WwJFOlHWnGSqcmGe8 SFQ9XoXI9ieyPhgOLf2OvdJVQAnL6qr31h6iDc0v3s7mmjcHdS8lDDeq7xF9aw== 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 4dqfH73YZ9zbpg for ; Mon, 12 Jan 2026 17:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Jan 2026 17:18:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 6eea426f016c - stable/15 - linuxkpi: Correct kstrtobool 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6eea426f016c0aa97ea5745dda6670042b81f698 Auto-Submitted: auto-generated Date: Mon, 12 Jan 2026 17:18:43 +0000 Message-Id: <69652cf3.36d73.75c8c775@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6eea426f016c0aa97ea5745dda6670042b81f698 commit 6eea426f016c0aa97ea5745dda6670042b81f698 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-12 17:18:21 +0000 linuxkpi: Correct kstrtobool Implement the exact same logic as in Linux: * Accept 'e', 't', 'y', '1', "on" for true. * Accept 'd', 'f', 'n', '0', "of" for false. * Disregard any characters beyond that. * Check that the string is not null, but don't check the result pointer. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D54451 (cherry picked from commit f86148d2777d4d7985ed8f4ae957c41c44bd2484) --- sys/compat/linuxkpi/common/include/linux/kstrtox.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kstrtox.h b/sys/compat/linuxkpi/common/include/linux/kstrtox.h index 6a145c409038..05bf94dd375d 100644 --- a/sys/compat/linuxkpi/common/include/linux/kstrtox.h +++ b/sys/compat/linuxkpi/common/include/linux/kstrtox.h @@ -249,22 +249,16 @@ kstrtoull(const char *cp, unsigned int base, unsigned long long *res) static inline int kstrtobool(const char *s, bool *res) { - size_t len; - - if (s == NULL || (len = strlen(s)) == 0 || res == NULL) + if (s == NULL || *s == '\0') return (-EINVAL); - /* skip newline character, if any */ - if (s[len - 1] == '\n') - len--; - - if (len == 1 && strchr("yY1", s[0]) != NULL) + if (strchr("eEtTyY1", s[0]) != NULL) *res = true; - else if (len == 1 && strchr("nN0", s[0]) != NULL) + else if (strchr("dDfFnN0", s[0]) != NULL) *res = false; - else if (strncasecmp("on", s, len) == 0) + else if (strncasecmp("on", s, 2) == 0) *res = true; - else if (strncasecmp("off", s, len) == 0) + else if (strncasecmp("of", s, 2) == 0) *res = false; else return (-EINVAL);