From nobody Sun Feb 20 18:15:40 2022 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 D191219CF249; Sun, 20 Feb 2022 18:15:42 +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 4K1ts94hTKz4XpH; Sun, 20 Feb 2022 18:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380942; 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=Mo+gV5E6zJRuNaE59gyYM+fvygjcFsGUwCNT7wtyAb0=; b=Prhn3urxWPkWXXkwOzvcw4voiN0V/PpjFL0HKCN02ABjvNnsfefmw5ikd1+cAujMrrPWXi jT6WMWceamMm9lPoZwq38KOv0Bl2PeTxGlt7YfCNfoUdb12+CRXcJijc/kX64NPIRauYw4 IU9H7D2fhm0fqQ2l+YdMvKAX8Gp6MF/o3ecPOdPfUYsrzIrmND46/vOeEADolFC6HLggAN 1IeecZYysEdMu3LkoON9y0EaEi+6KFkUDqMBiR0fPY4N1tWHkeNiww+iBLEe/gKIJWtGfX D/2uQNOQ3KO6vd7z7sOxCqQEBIJCFFB2sl2U04To5ExcRaemxgudVivWBRtVmg== 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 E16832105A; Sun, 20 Feb 2022 18:15:40 +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 21KIFeMD023004; Sun, 20 Feb 2022 18:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KIFeJZ023003; Sun, 20 Feb 2022 18:15:40 GMT (envelope-from git) Date: Sun, 20 Feb 2022 18:15:40 GMT Message-Id: <202202201815.21KIFeJZ023003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c3ffeddb4709 - stable/13 - LinuxKPI: add kstrtoint_from_user() and DECLARE_FLEX_ARRAY() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c3ffeddb4709fc6c5bebf84c52de7dd11dfca61c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380942; 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=Mo+gV5E6zJRuNaE59gyYM+fvygjcFsGUwCNT7wtyAb0=; b=B2Fj288j3bc7YwuU91ixdo/0CEreYclXcmheP5ElyRZWJOjRZ2plyRoGazzzr1SCSoDD5e kfiwzxCTEwoU6/5sc4r0yc6rHIVdciAfqsWGRLn8qVhA91tB7AAdVvNJqDut6aNr6Bw07z KoetIwoIP0cMxU1m2wwQS0eSt2cVCmz4M7sQH99KQIdSXOueUqb/662R94m8ibyFrcZadz qAysB6JcN91V+smkZD8TWKYXrt7xz/djV1B5A0YM3tQ6nS2WxCvs7eAZKKbuqzd9ftNCK9 2Ri963rbcoA/muP2J4M1TRsg1jnLmlZr6+7OByMLcTyLqAufCElbwVQBog53ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645380942; a=rsa-sha256; cv=none; b=n7MR4mg7XXiut7GoQCiqeMGm4o6RijKEPDHGxAAVK978a8syTpKLZajFOWhxONtyiUlvkg 240czhVYLNtHdUZGt3bwnsgiPdUgX0AWdjr4UP6uQQVjYPntpV+eUMm5Hqk493PSiiGW94 8atgrOPgWuK70vCuzPTnj8yxXyQTAl0OQgWqRLP04ra65djeWSozSDc/VB+CN+mNyQAZaD 2v6r4Qs9SYFEU8pqj0ZucsxHLbtdEgBJwiB8Y182yVFpxcHExOp/J/XLtXfW289Ga2Oqhq xvJbm6hZgj1m1AwXRkpomKHTMoAybkBLqIau0NbAPJ93HSZmIa0Tx7+iIdkimQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ffeddb4709fc6c5bebf84c52de7dd11dfca61c commit c3ffeddb4709fc6c5bebf84c52de7dd11dfca61c Author: Bjoern A. Zeeb AuthorDate: 2022-02-09 11:58:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-20 16:24:51 +0000 LinuxKPI: add kstrtoint_from_user() and DECLARE_FLEX_ARRAY() Add an implementation of kstrtoint_from_user() based on the other implementations and an attempt at DECLARE_FLEX_ARRAY() which works for the driver needing it. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D34231 (cherry picked from commit c840d5cec2607932d077ffcfee7ccf0a6b50cdf3) --- sys/compat/linuxkpi/common/include/linux/kernel.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 58581ebe9101..1e8fef985803 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -509,6 +509,21 @@ kstrtobool_from_user(const char __user *s, size_t count, bool *res) return (kstrtobool(buf, res)); } +static inline int +kstrtoint_from_user(const char __user *s, size_t count, unsigned int base, + int *p) +{ + char buf[36] = {}; + + if (count > (sizeof(buf) - 1)) + count = (sizeof(buf) - 1); + + if (copy_from_user(buf, s, count)) + return (-EFAULT); + + return (kstrtoint(buf, base, p)); +} + static inline int kstrtou8_from_user(const char __user *s, size_t count, unsigned int base, u8 *p) @@ -684,6 +699,9 @@ hex2bin(uint8_t *bindst, const char *hexsrc, size_t binlen) return (0); } +#define DECLARE_FLEX_ARRAY(_t, _n) \ + struct { struct { } __dummy_ ## _n; _t _n[]; } + /* * Checking if an option is defined would be easy if we could do CPP inside CPP. * The defined case whether -Dxxx or -Dxxx=1 are easy to deal with. In either