From nobody Sat Jan 3 09:10:39 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 4djvt76dNFz6LxBD for ; Sat, 03 Jan 2026 09:10:39 +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 4djvt74GMkz3Jgd for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431439; 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=pygJJMg/nIlaU2SGs9OHxu1MfIcKLwSo2+1bbEaZ+vA=; b=G7ZQhM8q+Rw6ftS3PVdy0zy+iZXhFWS5ZR4xhNCarbY9RTT/0k14MDCmdtqmMcYO91THNi f1muKQpk95qZl1b05mk3t8HjMq9gsGwhGrICtdAx7OCFRG1KlY9muPvGceo8DWKLtYOG6e q02+mPqOE2AUUL12guNLDYyUeVBOU7bdWthiAxZLBoqxxfrngtLiVXKducTY7iJ+QD3qPc z0Ok1stl723JE8w1nNoIHmjwisFzrFJSjlT51wbaI6qS3DpTe5wzff8lovygHkyAgG0ZtH nDwFs3m7DkC28AcPowz++Y4epNnO5bPd/2I/K52KklHn+8ijoY7hePBdab8lJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431439; 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=pygJJMg/nIlaU2SGs9OHxu1MfIcKLwSo2+1bbEaZ+vA=; b=mV6z2DSBrvxga9DvaPCOir0xZd1Ik1j431vge8zG6X5beQGNz/is21sdRuUR4p7wLV45JI qo6v4bqDrYqwRUNQQlMvotpzUOWRHgKT3t8ybR7JjReicop0KvA+2LVG5jYI8wYubuq31E tg3TCllRPzDLn0CcUnS53Cfyc/VzKSX4oq/vwv+TFp1MLLkALQbf/+oQU2GBjtMaRHScCs 5PsPxQeSL30cMQmIpbtLMABjj93PMy2zcOTGVze0/LyaHzyqXtm8/rLw3AILTP9BGJ2+6R ztJ2f72Ec0fwzL+hP5TWFbsP8fD+OOO5I978TduxY9lJil8VDYSYNiOEIPzEfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431439; a=rsa-sha256; cv=none; b=gOAqA4hvYCB994wax5zQT7qbImm3KtctVVlBvRELtVkyUixTbkGz7pxS4b3QihXgaqPlVr HDqO1oXMJZqM3k1iVf29k8gisYwJy4TrZYjLeRzDKUVIWkI4SvqPRi5OHklDBREvKvmqtR 6IF+6SdyZ4hfb7LKLFd1edjnrLJB4TCUiIzcaGqgFgF3or7bKy2AE0wkXCMim7BlHN5kb8 epIqLI6uIfIiNtezEm7qU4PzswfIiMpPgNZ0BDYpixwAE1nZ9vsDlPNOS/Veax28Ps/OGQ KVRS+mQAC8EFS65ixEzO2zYItgb76DQWCX7qUl4pgrRpHh+GNieGrDdIXIjUCA== 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 4djvt73K3kzxg0 for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f86148d2777d - main - 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/main X-Git-Reftype: branch X-Git-Commit: f86148d2777d4d7985ed8f4ae957c41c44bd2484 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:39 +0000 Message-Id: <6958dd0f.98dc.3f85f227@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f86148d2777d4d7985ed8f4ae957c41c44bd2484 commit f86148d2777d4d7985ed8f4ae957c41c44bd2484 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:22 +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 --- 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);