From patchwork Tue Jun 27 14:43:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 113454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8257612vqr; Tue, 27 Jun 2023 07:54:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5OyRaP36juRDm9gx97Y4815XESnBB9oWWLyyYwzx0Uj+LtCbeVf8wqOSTH5WhlBqhlhST5 X-Received: by 2002:aa7:db4f:0:b0:51a:5ac3:4df8 with SMTP id n15-20020aa7db4f000000b0051a5ac34df8mr16507899edt.5.1687877688270; Tue, 27 Jun 2023 07:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687877688; cv=none; d=google.com; s=arc-20160816; b=pvf1OSZoxen2dy/TvE0lp8FT9Vq0t55aFZzf+iMPVnKFripUzFQ3eOzgX6NBbb50b9 rMDkaXCgn9geUApfjaIL8iYvXGSqqAwVvc7MWrRjm8Ln57g34NC2gvJ/Z4FAbQoehJIp R8GydQXmOWu/g8vRN74MQHCnagykJN1uTVRVFQ2e4WFcghzNyYWwaJ7vsVHDw5PFZwQ0 xzNwwQ0CzmWcSJ+NBGElD6Qj/YKQU7Q8SuoPpjKFCd0b/HHMQL9DBdbI4UrHy5hQ5xq6 c2LRjfVcTfD0taBljbL1WBaHNiZZV9eJ/1bFgn+4OeKzgYDMibxYJwyEhNcC/arGCo92 Ftgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2mtRBGCOnnmq8owg9Z09zy3e8yDpPGmF5WIoD2SontQ=; fh=INSTs+KMEjXBQJLY4XLMumsk5AZsZlFf/93gHyvt3mw=; b=XtaFjPuCdLb0gIXoaVFEtJJErw9CxKpgezyWvmdncsoxSCv3UhcNVtdP4aDacaxa8+ de8Krsypa/E6/7c87G5aRvbZH2yOJU0G7IxKLJZ8sSG8sxk7qIvSPyQQkoW5FLogqFj0 1aqn8lHLlcx59/HC6TVwERijrS2SOmI60ngBPngVEVToog9P3waFy8kVDxsk5nE5R3ru 6+ttEBNIU+3LQ7bg3eC7+HnYROFA26KNIF157TVV9Q7aheiUas2yGKD3E0Gluf0E0l1/ CeL6IGrLoyYqlndCEdA420riWtJRcW4ebny7wLGJ9WjLC8J9mW5ObpOIIaQk7BLUzQ/I kp2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=OcPuxrmw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=inria.fr Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020aa7d491000000b0051d88350109si3831043edr.328.2023.06.27.07.54.23; Tue, 27 Jun 2023 07:54:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=OcPuxrmw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=inria.fr Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232130AbjF0Oq3 (ORCPT + 99 others); Tue, 27 Jun 2023 10:46:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231881AbjF0Op2 (ORCPT ); Tue, 27 Jun 2023 10:45:28 -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 6FBFA359E; Tue, 27 Jun 2023 07:45:19 -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=2mtRBGCOnnmq8owg9Z09zy3e8yDpPGmF5WIoD2SontQ=; b=OcPuxrmwn0aRonaE3elKZrFZuEyIeBl9WsoH87B97Do+eEB8eWsAZn3m Mp7IGkipazXYfiToh9tPy6Sbs1n//8Vov5hPoiHN59IzsQOpsXOz9RnUl iW5QAnDPa8qdtv9RCOwkIRsBlWDTBUZkQl25OewNifuJY1oBC2/d9V/4S M=; 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="114936333" 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:52 +0200 From: Julia Lawall To: Chris Mason Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Josef Bacik , David Sterba , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 12/24] btrfs: zoned: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:27 +0200 Message-Id: <20230627144339.144478-13-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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769868034815763888?= X-GMAIL-MSGID: =?utf-8?q?1769868034815763888?= 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 = 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 = {u8,__u8,char,unsigned char}; identifier alloc = {vmalloc,vzalloc}; fresh identifier realloc = 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. fs/btrfs/zoned.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -u -p a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -465,8 +465,8 @@ int btrfs_get_dev_zone_info(struct btrfs * use the cache. */ if (populate_cache && bdev_is_zoned(device->bdev)) { - zone_info->zone_cache = vzalloc(sizeof(struct blk_zone) * - zone_info->nr_zones); + zone_info->zone_cache = vcalloc(zone_info->nr_zones, + sizeof(struct blk_zone)); if (!zone_info->zone_cache) { btrfs_err_in_rcu(device->fs_info, "zoned: failed to allocate zone cache for %s",