From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 757AAC433E0 for ; Wed, 17 Jun 2020 21:28:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48D502186A for ; Wed, 17 Jun 2020 21:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592429328; bh=IBFohY0NkQV6wxVWydl+9zLFk4xIZ9akrDNFlU3W6Uo=; h=Date:From:To:Cc:Subject:List-ID:From; b=FneHcwfSFRBkOwJFovOtZmBj+58zyPZ5tTMBlWxvmREWtTEccd4xkYjd3xKEHWvEd PuuCKmuJ9wKqbpjFH6N3BbE9qHEfjiWcibtAiUMZe8b0aeilk4+h+EJo4Y5WhGQGUM Ah093WNND/2jHTnJEr5i+gyYW+H3Nl+0fXxAgwdw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727023AbgFQV2r (ORCPT ); Wed, 17 Jun 2020 17:28:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:53226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbgFQV2q (ORCPT ); Wed, 17 Jun 2020 17:28:46 -0400 Received: from embeddedor (unknown [189.207.59.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1DEFF2168B; Wed, 17 Jun 2020 21:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592429326; bh=IBFohY0NkQV6wxVWydl+9zLFk4xIZ9akrDNFlU3W6Uo=; h=Date:From:To:Cc:Subject:From; b=Y6dpZh7bJ3CfbAnLWwakIP0aW30Um9NyESw2YkrN7MB+b1GOEXvGSlJIn+Wujoipi 0yWJhrM9Iyd9LtnxrTYTU06A7f1WHIm6oVWIHYwTPT5tR9kJoY9+DAwwshCZpXKIFQ P5LizBptF6eP71PzEjvncvwupt6zpuAaJmR5xOS0= Date: Wed, 17 Jun 2020 16:34:07 -0500 From: "Gustavo A. R. Silva" To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH][next] arm64: kexec_file: Use struct_size() in kmalloc() Message-ID: <20200617213407.GA1385@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. This code was detected with the help of Coccinelle and, audited and fixed manually. Signed-off-by: Gustavo A. R. Silva --- arch/arm64/kernel/machine_kexec_file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 522e6f517ec0..361a1143e09e 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -219,8 +219,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz) MEMBLOCK_NONE, &start, &end, NULL) nr_ranges++; - cmem = kmalloc(sizeof(struct crash_mem) + - sizeof(struct crash_mem_range) * nr_ranges, GFP_KERNEL); + cmem = kmalloc(struct_size(cmem, ranges, nr_ranges), GFP_KERNEL); if (!cmem) return -ENOMEM; -- 2.27.0