Message ID | 20230627144339.144478-24-Julia.Lawall@inria.fr |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8254771vqr; Tue, 27 Jun 2023 07:49:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5a3krKG6eoVEUNhAVwxLVChpaF/OYzU/sfs7nqF/wj328UZC+Dx1iXvi08H2LcHdG4GpPv X-Received: by 2002:a17:906:eec9:b0:96b:e93:3aa8 with SMTP id wu9-20020a170906eec900b0096b0e933aa8mr27444281ejb.21.1687877392653; Tue, 27 Jun 2023 07:49:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687877392; cv=none; d=google.com; s=arc-20160816; b=PbhUUl+FBqvYl4EWSu5UAfiYdd2GFzXtnt5g3EECWU1+GlSgKDOh4Oj5g5MkPWHVD0 DR7ROHWN8dqX2h/NPvnkXETNs1CqZ1mHxc/L8uZCHTFW9uqtgmpmiO+7gd0H7CYy6cTt r/vppNblyeGOJL0K645lUmKaoAgT52t0kQEjePueQTFan6qrSyrL/a8WCIj5b1fxiD+v +CYlTHOOtWl00tpAG+jhh9JFM9nWnrSqf+COx6L4rHuZ0DftOLHoFVwjAVQ4d6UtPTBA NSo5nMyWmquHto08VjbT4JvrTrS/28Tvsql02fMffUHfhIK0+RdAn3JZICrbRR4pwi1K KFZg== 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=1fuBHkuVCLvBAw8MSaPz0+UJaQZjfgmRVP18IwyNeDQ=; fh=8ZAmWz3KuL4uniLkQvxSfAdIbL4KHtMaoLSgn3cQUic=; b=0pUWJijNcQ7D5D2tE7ruNpScnsv9wyu7Won1h04GBDhAFj+vBW+2sPA2t/tUGGhpyl MlYLs+v231PFI9gIqkIjJjX//UJKUOH9cg0CnQfUt27KN6cFX7NWsP1Me8kOmRVXPpke vLuxQc1tKK2myqnUsZzR0UqC3QPJB2QSw9nSFpjIzz/3bZBwTkIJz/GFiGhWt7PYe4Hr 0OtI0ygiYRJFKb1TFBd2IZRI4fkVa48f+weCkblegUIK4ygB4gI5Ru7+fEKugC3LXAqJ 756iq28UoSrG+53ggo2yj3anq3cqQXzR5o04em3xQVaLXtFXkm8bilhvcQQ+Tm5TcRR9 MaIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=OThXz5HO; 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 rh22-20020a17090720f600b0098e19ebc8fcsi3868940ejb.679.2023.06.27.07.49.28; Tue, 27 Jun 2023 07:49:52 -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=OThXz5HO; 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 S231696AbjF0OrL (ORCPT <rfc822;nicolai.engesland@gmail.com> + 99 others); Tue, 27 Jun 2023 10:47:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231992AbjF0Op5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 27 Jun 2023 10:45:57 -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 391013593; Tue, 27 Jun 2023 07:45:27 -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=1fuBHkuVCLvBAw8MSaPz0+UJaQZjfgmRVP18IwyNeDQ=; b=OThXz5HOfGeTx9GD1nvtvqYG/QJvKBhAtvHz62cnidSYuUWImbYlLedV QyDiCsD4jvF4TDB040IrOhHB/CSeZG4H1P4v4+Zu6HW/zl+fwnSIwGIYT nJ93hxVqPqxEW9Mu1JxrZeFxmha8G4U9oBr7c2HOjcOaDb2Po5/neaAlT Y=; 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="114936346" 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:53 +0200 From: Julia Lawall <Julia.Lawall@inria.fr> To: "Michael S. Tsirkin" <mst@redhat.com> Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Jason Wang <jasowang@redhat.com>, Xuan Zhuo <xuanzhuo@linux.alibaba.com>, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 23/24] vduse: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:38 +0200 Message-Id: <20230627144339.144478-24-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: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769867724674984745?= X-GMAIL-MSGID: =?utf-8?q?1769867724674984745?= |
Series |
use vmalloc_array and vcalloc
|
|
Commit Message
Julia Lawall
June 27, 2023, 2:43 p.m. UTC
Use vmalloc_array and vcalloc to protect against
multiplication overflows.
The changes were done using the following Coccinelle
semantic patch:
// <smpl>
@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)
)
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
---
v2: Use vmalloc_array and vcalloc instead of array_size.
This also leaves a multiplication of a constant by a sizeof
as is. The position of this patch in the series changed
accordingly.
drivers/vdpa/vdpa_user/iova_domain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -u -p a/drivers/vdpa/vdpa_user/iova_domain.c b/drivers/vdpa/vdpa_user/iova_domain.c --- a/drivers/vdpa/vdpa_user/iova_domain.c +++ b/drivers/vdpa/vdpa_user/iova_domain.c @@ -571,8 +571,8 @@ vduse_domain_create(unsigned long iova_l domain->iova_limit = iova_limit; domain->bounce_size = PAGE_ALIGN(bounce_size); - domain->bounce_maps = vzalloc(bounce_pfns * - sizeof(struct vduse_bounce_map)); + domain->bounce_maps = vcalloc(bounce_pfns, + sizeof(struct vduse_bounce_map)); if (!domain->bounce_maps) goto err_map;