From patchwork Tue Jun 27 14:43:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 113475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8268728vqr; Tue, 27 Jun 2023 08:08:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7tIP9oOfVYHL+sY8Mxrco4gS4oSNdgbB6L1OAprqNRzYDXl0HQxXpokmQNuLPmzQNyuoAq X-Received: by 2002:a05:6a21:999c:b0:126:5ffd:c5b7 with SMTP id ve28-20020a056a21999c00b001265ffdc5b7mr14073450pzb.22.1687878485928; Tue, 27 Jun 2023 08:08:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878485; cv=none; d=google.com; s=arc-20160816; b=z+mjej6Wduh3QggOl1RR92UeHKO5GuBAieucNNZ36IOTyfPaTByJ8WhiGGrirGuRCd 69L+yR9nY5+EB0JEXIs3fuxKimEh6Du9bK38c7HCfoWK8ssmImSePtkKzu4kSYL6BjTp djjnUoKa3MAJUUztW4GH03hD6s7wNFFzY0IDF02TWVzHM7v3E+rMEmd1lXQrxMukJ9oh oeVXS6e9FvAMVPVs6jWZHQmZ/CZfJuhQXfbtNkd529o1diQ2rR83qm81pseTlXBPFpYV H7n+eru0XRyu6WuznE13wFSxnDeEHK20gt1P94SMwi5srvgGYs6LYg/joMFkycRLrV9N SbHA== 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=tzdHyO2WkZ+/4hPd1oFud1vh1gFsmlhbwd5pOc3CStU=; fh=0KXxUBdGdTZUREAi7vY5lmM/NYX8UoMHfo6Q4BbR6pg=; b=Q+eJuHJLyL4QW6Cn0qbK2laPnLySqJ3byva3No4UHXMfQWaFyiugPzukmQ1h/UO0D5 fqVOm7doJI6shKVkDpGzojFUMp4zm/ZTnrevqAjnfDPNGiozzSz3NqHoLrwM9Dm6Fi4z fzsH/7pQr57XOpgdMyJ9IOF/4kHlxF6OgZNi94V399WYgpeqvXm5+P+63nDOuwQa7utx PcQsc/qyMSdBiUAEJHE1fvwcu0nbXLrAk5hDDVHlvBi0Q5aft3oirUml4gOoU9sbN7LA Qi6Vgwjw/cnIGJkHh+R4GkN/xxKUV5kWRECCtCGJ1OJmauo4zWk4sGZYBh8ZGUDbAKY+ qclQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=YFRO9acw; 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 q1-20020a056a00150100b00666631f7ed9si7341197pfu.82.2023.06.27.08.07.52; Tue, 27 Jun 2023 08:08:05 -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=YFRO9acw; 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 S231985AbjF0Oqp (ORCPT + 99 others); Tue, 27 Jun 2023 10:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231968AbjF0Opn (ORCPT ); Tue, 27 Jun 2023 10:45:43 -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 19721273C; Tue, 27 Jun 2023 07:45:22 -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=tzdHyO2WkZ+/4hPd1oFud1vh1gFsmlhbwd5pOc3CStU=; b=YFRO9acwySrxiS5SFbzoT1YrVzANqJrEedC6LESFP2q+N87wGaSsp+K8 coUUn8YtjsqjzxyiuVIzB57myohVF0rG/rM8ldUD8f745mtj2AO2ZIJGm 4Qdc3b6VAAKdCtQOCew/H5rCzZWc5hA4nQXETwpclVpOEGprtGSC06u5a 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="114936340" 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: Dmitry Vyukov Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Andrey Konovalov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 17/24] kcov: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:32 +0200 Message-Id: <20230627144339.144478-18-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?1769868871077681037?= X-GMAIL-MSGID: =?utf-8?q?1769868871077681037?= 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. kernel/kcov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -u -p a/kernel/kcov.c b/kernel/kcov.c --- a/kernel/kcov.c +++ b/kernel/kcov.c @@ -901,7 +901,7 @@ void kcov_remote_start(u64 handle) /* Can only happen when in_task(). */ if (!area) { local_unlock_irqrestore(&kcov_percpu_data.lock, flags); - area = vmalloc(size * sizeof(unsigned long)); + area = vmalloc_array(size, sizeof(unsigned long)); if (!area) { kcov_put(kcov); return;