From patchwork Tue Oct 13 16:53:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 11835891 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E77121130 for ; Tue, 13 Oct 2020 18:11:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04342252F5 for ; Tue, 13 Oct 2020 16:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387582AbgJMQxX (ORCPT ); Tue, 13 Oct 2020 12:53:23 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:59165 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727696AbgJMQxW (ORCPT ); Tue, 13 Oct 2020 12:53:22 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kSNY5-00024v-5D; Tue, 13 Oct 2020 16:53:17 +0000 From: Colin King To: Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E . Hallyn" , Roberto Sassu , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][V2] ima: Fix sizeof mismatches Date: Tue, 13 Oct 2020 17:53:16 +0100 Message-Id: <20201013165316.215897-1-colin.king@canonical.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: From: Colin Ian King An incorrect sizeof is being used, sizeof(*fields) is not correct, it should be sizeof(**fields). This is not causing a problem since the size of these is the same. Fix this. Also replace kmalloc_array and memcpy with a kmemdup. Addresses-Coverity: ("Sizeof not portable (SIZEOF_MISMATCH)") Fixes: 1bd7face7439 ("ima: allocate field pointers array on demand in template_desc_init_fields()") Signed-off-by: Colin Ian King --- V2: Replace kmalloc_array and memcpy with kmemdup as suggested by Joe Perches. --- security/integrity/ima/ima_template.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c index 1e89e2d3851f..83886e767678 100644 --- a/security/integrity/ima/ima_template.c +++ b/security/integrity/ima/ima_template.c @@ -216,11 +216,10 @@ int template_desc_init_fields(const char *template_fmt, } if (fields && num_fields) { - *fields = kmalloc_array(i, sizeof(*fields), GFP_KERNEL); + *fields = kmemdup(found_fields, i * sizeof(**fields), GFP_KERNEL); if (*fields == NULL) return -ENOMEM; - memcpy(*fields, found_fields, i * sizeof(*fields)); *num_fields = i; }