From nobody Tue Feb 10 11:56:19 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CF913385A9; Fri, 19 Dec 2025 12:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766146572; cv=none; b=D33saIQDWTOVvqif3r7ZvvA8f+YIRAwu+8tOEgbQ4/Pcgu8vvQCsdHJr5nGbxEli4I5K0E8/pfSbQn0ltPn3eOyh2augk8PP5cd32w7aPr2gAiQj6zKSvl57rFfC2621QcbdP2zjm5PqqncfTikugGjKqRGrjaJhURuwkDiSs4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766146572; c=relaxed/simple; bh=lGwAIyp+j4sPhraBT9VqqYDul5ESKjWOHxREAsCubL4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XkaUUZ6nQcxlZlCDA/D0mm6Atp/8rBiHJSKmSoObwcZ4dDgksmrbpZvTsmPX82/1mZJo867mzhPfcX02aQtpNNddeIk7FMu0n0VmGRSKZORSpbUVr7XeEZfVUCn1qnJyLl/DglRtCPQCrmzSl3i6Vl+BX26afuoyN0d2bgFNH2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H8ftuslV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H8ftuslV" Received: by smtp.kernel.org (Postfix) with ESMTPS id BF787C2BC86; Fri, 19 Dec 2025 12:16:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766146571; bh=lGwAIyp+j4sPhraBT9VqqYDul5ESKjWOHxREAsCubL4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=H8ftuslVH47fHOxKmKpWj3G5IpEZVWmTRalMZCYkwirbabkC4SkdsXaIHyVugxtxu PE9CJVqUODsdc44rOjqsglLJuU2EtqdRVHIS+NwmjH02bXITN/z0jld97b6szKr2OQ G6IwCm9kXKgqfm6ha+2Vi/CxZqbX657huELBdaTe3/k9qltbrAX3z7cv9vfHb2Goi4 c8fgVJtpuXYDLVRHTA794oGK0/9vcC6pozd3VS08OICI0Iup2upK59+Jite32YOhdt vnJtvbiWBSENy3F0nN0WhvGekJaRliPINXhfA6GKoYzS35muT8BSLyDiDx/TJ0PGnS upi6dceoHBfYg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B85DBD78761; Fri, 19 Dec 2025 12:16:11 +0000 (UTC) From: Joel Granados Date: Fri, 19 Dec 2025 13:15:56 +0100 Subject: [PATCH 5/9] sysctl: Generate do_proc_douintvec with a type-generic macro Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251219-jag-dovec_consolidate-v1-5-1413b92c6040@kernel.org> References: <20251219-jag-dovec_consolidate-v1-0-1413b92c6040@kernel.org> In-Reply-To: <20251219-jag-dovec_consolidate-v1-0-1413b92c6040@kernel.org> To: Kees Cook , Alexander Viro , Christian Brauner , Jan Kara Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3960; i=joel.granados@kernel.org; h=from:subject:message-id; bh=lGwAIyp+j4sPhraBT9VqqYDul5ESKjWOHxREAsCubL4=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGlFQgeZHbxH9vwL5QklyE8aaBz92idYH9nJS MW1Kglb1ccT6IkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJpRUIHAAoJELqXzVK3 lkFP+0QL/2bugkOsxBAG3heYbcF/ZnWoTX1He24efKOzYDCs0REK5VOvwAIUhiKh0L6GLwCYmkQ lDMTaFMG+PEvLgpcTgStsjquhCEPLb7IX29ujagic+j4Wu6fGbkBPSKYpaduYRRtK8ZR3in3fPE AB2Odtx5ome0+MI/kzLGj6dzaDPyq1MHUiPK6MgMiP42Nw+OOetzu22ch10VCU1S8jK9iKjPnBs y7ZPF1fUACyfKlHDwBniRQakTgMa3St2inKctKaHK6KimxxkBzblcMEQWbldAhZp6D/AxoYddOZ nbDUg4VG5UF8VLaoMJx0m4GR7brZ8dgir0usyJVEJbfDQfwukj7+6BRw/62wa/VBucjElJklCBJ 59mpaF58e/wfunwRLCgTORhbaoXaNGBv9cetYsJPZ8jWlFNJomUTcH7PEIwXZi/E50kSlDbNfbb E7oPnQPF42NxElYqUkdk6bQHKt6YKR5OS4V48Fo4VVEZoDPyLYkZUzriWxDjgHhv9f/rjb1rLf5 D0= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Generate the behavior in do_proc_douintvec{,_w,_r} functions with do_proc_dotypevec(uint). The originals (do_proc_douintvec{,_w,_r}) where created in the same way as do_proc_dotypevec but for individual values (no vectors). In this commit we use the existing macro implementation to extend do_proc_douintvec to include vectors of values. Signed-off-by: Joel Granados --- kernel/sysctl.c | 118 ++--------------------------------------------------= ---- 1 file changed, 3 insertions(+), 115 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8d0796b45b0101096ee395c7ed7c37f7b7199db4..4fa26b913f59c60a5b4fbc2d66d= 5d99c641eecba 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -451,8 +451,8 @@ static int do_proc_uint_conv(bool *negp, ulong *u_ptr, = uint *k_ptr, int dir, proc_uint_u2k_conv, proc_uint_k2u_conv); } =20 -static int do_proc_uint_conv_minmax(ulong *u_ptr, uint *k_ptr, int dir, - const struct ctl_table *tbl) +static int do_proc_uint_conv_minmax(bool *negp, ulong *u_ptr, uint *k_ptr, + int dir, const struct ctl_table *tbl) { return proc_uint_conv(u_ptr, k_ptr, dir, tbl, true, proc_uint_u2k_conv, proc_uint_k2u_conv); @@ -649,119 +649,7 @@ out: \ =20 do_proc_dotypevec(int) do_proc_dotypevec(ulong) - -static int do_proc_douintvec_w(const struct ctl_table *table, void *buffer, - size_t *lenp, loff_t *ppos, - int (*conv)(bool *negp, unsigned long *u_ptr, - unsigned int *k_ptr, int dir, - const struct ctl_table *table)) -{ - unsigned long lval; - int err =3D 0; - size_t left; - bool neg; - char *p =3D buffer; - - left =3D *lenp; - - if (proc_first_pos_non_zero_ignore(ppos, table)) - goto bail_early; - - if (left > PAGE_SIZE - 1) - left =3D PAGE_SIZE - 1; - - proc_skip_spaces(&p, &left); - if (!left) { - err =3D -EINVAL; - goto out_free; - } - - err =3D proc_get_long(&p, &left, &lval, &neg, - proc_wspace_sep, - sizeof(proc_wspace_sep), NULL); - if (err || neg) { - err =3D -EINVAL; - goto out_free; - } - - if (conv(&lval, (unsigned int *) table->data, 1, table)) { - err =3D -EINVAL; - goto out_free; - } - - if (!err && left) - proc_skip_spaces(&p, &left); - -out_free: - if (err) - return -EINVAL; - - return 0; - -bail_early: - *ppos +=3D *lenp; - return err; -} - -static int do_proc_douintvec_r(const struct ctl_table *table, void *buffer, - size_t *lenp, loff_t *ppos, - int (*conv)(bool *negp, unsigned long *u_ptr, - unsigned int *k_ptr, int dir, - const struct ctl_table *table)) -{ - unsigned long lval; - int err =3D 0; - size_t left; - bool negp; - - left =3D *lenp; - - if (conv(&negp, &lval, (unsigned int *) table->data, 0, table)) { - err =3D -EINVAL; - goto out; - } - - proc_put_long(&buffer, &left, lval, false); - if (!left) - goto out; - - proc_put_char(&buffer, &left, '\n'); - -out: - *lenp -=3D left; - *ppos +=3D *lenp; - - return err; -} - -static int do_proc_douintvec(const struct ctl_table *table, int dir, - void *buffer, size_t *lenp, loff_t *ppos, - int (*conv)(bool *negp, ulong *u_ptr, uint *k_ptr, - int dir, const struct ctl_table *table)) -{ - unsigned int vleft; - - if (!table->data || !table->maxlen || !*lenp || - (*ppos && SYSCTL_KERN_TO_USER(dir))) { - *lenp =3D 0; - return 0; - } - - vleft =3D table->maxlen / sizeof(unsigned int); - - /* - * Arrays are not supported, keep this simple. *Do not* add - * support for them. - */ - if (vleft !=3D 1) { - *lenp =3D 0; - return -EINVAL; - } - - if (SYSCTL_USER_TO_KERN(dir)) - return do_proc_douintvec_w(table, buffer, lenp, ppos, conv); - return do_proc_douintvec_r(table, buffer, lenp, ppos, conv); -} +do_proc_dotypevec(uint) =20 /** * proc_douintvec_conv - read a vector of unsigned ints with a custom conv= erter --=20 2.50.1