From nobody Tue Feb 10 10:18:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4782C001DE for ; Tue, 27 Jun 2023 14:45:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231842AbjF0Op1 (ORCPT ); Tue, 27 Jun 2023 10:45:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231684AbjF0Oop (ORCPT ); Tue, 27 Jun 2023 10:44:45 -0400 Received: from mail2-relais-roc.national.inria.fr (mail2-relais-roc.national.inria.fr [192.134.164.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7654F12C; Tue, 27 Jun 2023 07:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cW6FsUc372OgjCXWGlVTOpJDBn/sKhwbAV7MvUlsfDU=; b=jWt7EReJ5kDtaESX69GV8d4liYZONaNjYK6YwdVqiDhOrR+UO9w9kKRo +ywuVIwSPjmV/l3kagzTPaaXWEA08ystOtiHsidk5aXckj/9gzF9Rpoj3 I1ITEQ51Rbp6KM/FiTv0VHqRI8yNXSJ9Lc78ZzS16NIIda7XjaWrQUZT3 A=; Authentication-Results: mail2-relais-roc.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=Julia.Lawall@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.01,162,1684792800"; d="scan'208";a="114936318" Received: from i80.paris.inria.fr (HELO i80.paris.inria.fr.) ([128.93.90.48]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2023 16:43:51 +0200 From: Julia Lawall To: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org Subject: [PATCH v2 01/24] lib/test_vmalloc.c: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:16 +0200 Message-Id: <20230627144339.144478-2-Julia.Lawall@inria.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230627144339.144478-1-Julia.Lawall@inria.fr> References: <20230627144339.144478-1-Julia.Lawall@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use vmalloc_array and vcalloc to protect against multiplication overflows. The changes were done using the following Coccinelle semantic patch: // @initialize:ocaml@ @@ let rename alloc =3D match alloc with "vmalloc" -> "vmalloc_array" | "vzalloc" -> "vcalloc" | _ -> failwith "unknown" @@ size_t e1,e2; constant C1, C2; expression E1, E2, COUNT, x1, x2, x3; typedef u8; typedef __u8; type t =3D {u8,__u8,char,unsigned char}; identifier alloc =3D {vmalloc,vzalloc}; fresh identifier realloc =3D script:ocaml(alloc) { rename alloc }; @@ ( alloc(x1*x2*x3) | alloc(C1 * C2) | alloc((sizeof(t)) * (COUNT), ...) | - alloc((e1) * (e2)) + realloc(e1, e2) | - alloc((e1) * (COUNT)) + realloc(COUNT, e1) | - alloc((E1) * (E2)) + realloc(E1, E2) ) // Signed-off-by: Julia Lawall --- v2: Use vmalloc_array and vcalloc instead of array_size. This also leaves a multiplication of a constant by a sizeof as is. Two patches are thus dropped from the series. lib/test_vmalloc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -u -p a/lib/test_vmalloc.c b/lib/test_vmalloc.c --- a/lib/test_vmalloc.c +++ b/lib/test_vmalloc.c @@ -156,7 +156,7 @@ static int random_size_alloc_test(void) =20 for (i =3D 0; i < test_loop_count; i++) { n =3D get_random_u32_inclusive(1, 100); - p =3D vmalloc(n * PAGE_SIZE); + p =3D vmalloc_array(n, PAGE_SIZE); =20 if (!p) return -1; @@ -221,11 +221,11 @@ static int full_fit_alloc_test(void) junk_length =3D fls(num_online_cpus()); junk_length *=3D (32 * 1024 * 1024 / PAGE_SIZE); =20 - ptr =3D vmalloc(sizeof(void *) * junk_length); + ptr =3D vmalloc_array(junk_length, sizeof(void *)); if (!ptr) return rv; =20 - junk_ptr =3D vmalloc(sizeof(void *) * junk_length); + junk_ptr =3D vmalloc_array(junk_length, sizeof(void *)); if (!junk_ptr) { vfree(ptr); return rv; @@ -271,7 +271,8 @@ static int fix_size_alloc_test(void) if (use_huge) ptr =3D vmalloc_huge((nr_pages > 0 ? nr_pages:1) * PAGE_SIZE, GFP_KERNE= L); else - ptr =3D vmalloc((nr_pages > 0 ? nr_pages:1) * PAGE_SIZE); + ptr =3D vmalloc_array(nr_pages > 0 ? nr_pages : 1, + PAGE_SIZE); =20 if (!ptr) return -1;