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=-6.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 3FA87C433E7 for ; Mon, 12 Oct 2020 18:06:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDFA42076D for ; Mon, 12 Oct 2020 18:06:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404165AbgJLSGI (ORCPT ); Mon, 12 Oct 2020 14:06:08 -0400 Received: from smtprelay0239.hostedemail.com ([216.40.44.239]:48904 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2403943AbgJLSGI (ORCPT ); Mon, 12 Oct 2020 14:06:08 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay05.hostedemail.com (Postfix) with ESMTP id 5256018029129; Mon, 12 Oct 2020 18:06:07 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: comb67_5601f4e271fc X-Filterd-Recvd-Size: 2685 Received: from XPS-9350.home (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf19.hostedemail.com (Postfix) with ESMTPA; Mon, 12 Oct 2020 18:06:05 +0000 (UTC) Message-ID: Subject: Re: [PATCH] ima: Fix sizeof mismatches From: Joe Perches To: Mimi Zohar , Colin King , 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 Date: Mon, 12 Oct 2020 11:06:04 -0700 In-Reply-To: References: <20201007110243.19033-1-colin.king@canonical.com> <55ae0b6152c84013d483b1bbecb28a425801c408.camel@perches.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.36.4-0ubuntu1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Mon, 2020-10-12 at 13:51 -0400, Mimi Zohar wrote: > On Wed, 2020-10-07 at 11:27 -0700, Joe Perches wrote: > > On Wed, 2020-10-07 at 12:02 +0100, Colin King wrote: > > > 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 in the kmalloc_array and > > > memcpy calls. > > [] > > > diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c > > [] > > > @@ -216,11 +216,11 @@ int template_desc_init_fields(const char *template_fmt, > > > } > > > > > > if (fields && num_fields) { > > > - *fields = kmalloc_array(i, sizeof(*fields), GFP_KERNEL); > > > + *fields = kmalloc_array(i, sizeof(**fields), GFP_KERNEL); > > > if (*fields == NULL) > > > return -ENOMEM; > > > > > > - memcpy(*fields, found_fields, i * sizeof(*fields)); > > > + memcpy(*fields, found_fields, i * sizeof(**fields)); > > > > Maybe use kmemdup instead. > > > > if (fields && num_fields) { > > *fields = kmemdup(found_fields, i * sizeof(**fields), GFP_KERNEL); > > etc... > > > > Thanks, Joe. Since this patch will be backported, perhaps it would be > better to leave this as a bug fix and upstream other changes > independently. IMO: This patch doesn't need need backporting as it doesn't actually fix anything other than a style defect. void * and void ** are the same size. cheers, Joe