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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DB2AECAAD8 for ; Sat, 17 Sep 2022 00:22:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229625AbiIQAVC (ORCPT ); Fri, 16 Sep 2022 20:21:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbiIQAU4 (ORCPT ); Fri, 16 Sep 2022 20:20:56 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3201C56BAE for ; Fri, 16 Sep 2022 17:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663374051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MEb8Ji/9KFiKVcDLJzMC0DUftq+9xtbvWBEmYmwdpAU=; b=fLLADRkaeNf2kwDsx1eHHHJNrF0SA95OKdzSpyvbekvY1D9HjvYW3W5vlhdFmwl0oTnmQV +BlgI9XxyNurPYQmCBB3+XvPUVNJeE7cCkeLRHkiLlf3Ch7fMuTsCFLD24LwSId72CYYAG rytIVOxHxSE2vxItqvDyyB9xiTqWJeo= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-584-p_-AM9yRPcSJwMEw1w-H3A-1; Fri, 16 Sep 2022 20:20:50 -0400 X-MC-Unique: p_-AM9yRPcSJwMEw1w-H3A-1 Received: by mail-qv1-f70.google.com with SMTP id ec8-20020ad44e68000000b004aab01f3eaaso15789988qvb.4 for ; Fri, 16 Sep 2022 17:20:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :x-gm-message-state:from:to:cc:subject:date; bh=MEb8Ji/9KFiKVcDLJzMC0DUftq+9xtbvWBEmYmwdpAU=; b=tCNDuW2SAD7DiOP2VqU1ykKK1t2FZtdq1H8jDiMG7803gbHIg1pqXkUOazHcEUp+kg 5mmgFjUm1HjHdnsRyVs8SfW3WfPVUDOlLowOEMj7qwpxOLd7d3kIl/O+16nSc7fGUlBD hPc8j4Kd5tB4G2rmKNc9hYClg/q97wB4Icd31xVrzIgplNIeTJ5GidLFgjbVaB6X0Bry HGzDXRHr02RPskMGHNs9ZBgTpcmr/VjYV9kEhZbpwQ8ad2EB7lXvlw2E8qRTprM7hCT5 mti2LMTSIPnP5e8mAY9XEoc+7RPbOIgbKC6RXT/CLhD/AJ9nBY3LRPO7OEfwdGVxchmS WAaQ== X-Gm-Message-State: ACrzQf3m/i+fyiqCg0eQnwREkczVvtQPo0VCl9/ysPK1dr+YI3+YNFnL Ci5U/D7qr2r79UBHh3Xhw2ueOtC1sxmrJkT6jjcfuS2DC1W7tOe0OkyKpgoj0aWAHh+48iAkVqw iK38juVOyzC/nsDhv6zn9vA== X-Received: by 2002:a05:622a:30f:b0:344:b51a:cc64 with SMTP id q15-20020a05622a030f00b00344b51acc64mr6536440qtw.336.1663374049856; Fri, 16 Sep 2022 17:20:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Duh4jt7m6TsImezWnknJ3dovH5bbkCwsX9dad263+d6wHNjA43YrFXBJ08iGCKsSJTj2BAA== X-Received: by 2002:a05:622a:30f:b0:344:b51a:cc64 with SMTP id q15-20020a05622a030f00b00344b51acc64mr6536418qtw.336.1663374049653; Fri, 16 Sep 2022 17:20:49 -0700 (PDT) Received: from localhost.localdomain (024-205-208-113.res.spectrum.com. [24.205.208.113]) by smtp.gmail.com with ESMTPSA id w8-20020a05620a444800b006ce30a5f892sm5077319qkp.102.2022.09.16.17.20.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Sep 2022 17:20:46 -0700 (PDT) Subject: Re: [PATCH v1 1/1] fpga: m10bmc-sec: Fix possible memory leak of flash_buf To: Russ Weight , mdf@kernel.org, hao.wu@intel.com, yilun.xu@intel.com, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org Cc: lgoncalv@redhat.com, marpagan@redhat.com, matthew.gerlach@linux.intel.com, basheer.ahmed.muddebihal@intel.com, tianfei.zhang@intel.com, kernel test robot , Dan Carpenter , stable@vger.kernel.org References: <20220916235205.106873-1-russell.h.weight@intel.com> From: Tom Rix Message-ID: Date: Fri, 16 Sep 2022 17:20:43 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20220916235205.106873-1-russell.h.weight@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org On 9/16/22 4:52 PM, Russ Weight wrote: > There is an error check following the allocation of flash_buf that returns > without freeing flash_buf. It makes more sense to do the error check > before the allocation and the reordering eliminates the memory leak. > > Reported-by: kernel test robot > Reported-by: Dan Carpenter > Fixes: 154afa5c31cd ("fpga: m10bmc-sec: expose max10 flash update count") > Signed-off-by: Russ Weight Reviewed-by: Tom Rix > Cc: > --- > drivers/fpga/intel-m10-bmc-sec-update.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c > index 526c8cdd1474..79d48852825e 100644 > --- a/drivers/fpga/intel-m10-bmc-sec-update.c > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c > @@ -148,10 +148,6 @@ static ssize_t flash_count_show(struct device *dev, > stride = regmap_get_reg_stride(sec->m10bmc->regmap); > num_bits = FLASH_COUNT_SIZE * 8; > > - flash_buf = kmalloc(FLASH_COUNT_SIZE, GFP_KERNEL); > - if (!flash_buf) > - return -ENOMEM; > - > if (FLASH_COUNT_SIZE % stride) { > dev_err(sec->dev, > "FLASH_COUNT_SIZE (0x%x) not aligned to stride (0x%x)\n", > @@ -160,6 +156,10 @@ static ssize_t flash_count_show(struct device *dev, > return -EINVAL; > } > > + flash_buf = kmalloc(FLASH_COUNT_SIZE, GFP_KERNEL); > + if (!flash_buf) > + return -ENOMEM; > + > ret = regmap_bulk_read(sec->m10bmc->regmap, STAGING_FLASH_COUNT, > flash_buf, FLASH_COUNT_SIZE / stride); > if (ret) {