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;
Date:   Mon, 26 Dec 2022 19:57:51 +0200 (EET)
From:   =?ISO-8859-15?Q?Ilpo_J=E4rvinen?= <ilpo.jarvinen@linux.intel.com>
To:     Xu Yilun <yilun.xu@intel.com>
cc:     Russ Weight <russell.h.weight@intel.com>,
        Moritz Fischer <mdf@kernel.org>, Wu Hao <hao.wu@intel.com>,
        Tom Rix <trix@redhat.com>, linux-fpga@vger.kernel.org,
        LKML <linux-kernel@vger.kernel.org>,
        Matthew Gerlach <matthew.gerlach@linux.intel.com>,
        Marco Pagani <marpagan@redhat.com>
Subject: Re: [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback
In-Reply-To: <Y6kZfHOCb18qmaeP@yilunxu-OptiPlex-7050>
Message-ID: <d435beb-f076-5212-ae7a-b3dedcb654e@linux.intel.com>
References: <20221214144952.8392-1-ilpo.jarvinen@linux.intel.com> <Y6kZfHOCb18qmaeP@yilunxu-OptiPlex-7050>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323329-566868870-1672077484=:1690"
Precedence: bulk

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323329-566868870-1672077484=:1690
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8BIT

On Mon, 26 Dec 2022, Xu Yilun wrote:

> On 2022-12-14 at 16:49:52 +0200, Ilpo J?rvinen wrote:
> > Handle probe error rollbacks properly to avoid leaks.
> > 
> > Fixes: 5cd339b370e2 ("fpga: m10bmc-sec: add max10 secure update functions")
> > Reviewed-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
> > Reviewed-by: Russ Weight <russell.h.weight@intel.com>
> > Reviewed-by: Marco Pagani <marpagan@redhat.com>
> > Signed-off-by: Ilpo J?rvinen <ilpo.jarvinen@linux.intel.com>
> 
> I assume this should be in stable kernel, so
>  
>  Cc: stable@vger.kernel.org
> 
> If OK, I could add it myself.

Yes, it should have been there but I forgot it.

Please add it like you suggested. Thanks.

-- 
 i.

> > ---
> > I don't know if the previous one fell through cracks so resending this.
> > 
> > v2:
> > - Resending v1 with Marco's Rev-by
> > 
> >  drivers/fpga/intel-m10-bmc-sec-update.c | 17 ++++++++++++-----
> >  1 file changed, 12 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
> > index 79d48852825e..03f1bd81c434 100644
> > --- a/drivers/fpga/intel-m10-bmc-sec-update.c
> > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c
> > @@ -574,20 +574,27 @@ static int m10bmc_sec_probe(struct platform_device *pdev)
> >  	len = scnprintf(buf, SEC_UPDATE_LEN_MAX, "secure-update%d",
> >  			sec->fw_name_id);
> >  	sec->fw_name = kmemdup_nul(buf, len, GFP_KERNEL);
> > -	if (!sec->fw_name)
> > -		return -ENOMEM;
> > +	if (!sec->fw_name) {
> > +		ret = -ENOMEM;
> > +		goto fw_name_fail;
> > +	}
> >  
> >  	fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name,
> >  				       &m10bmc_ops, sec);
> >  	if (IS_ERR(fwl)) {
> >  		dev_err(sec->dev, "Firmware Upload driver failed to start\n");
> > -		kfree(sec->fw_name);
> > -		xa_erase(&fw_upload_xa, sec->fw_name_id);
> > -		return PTR_ERR(fwl);
> > +		ret = PTR_ERR(fwl);
> > +		goto fw_uploader_fail;
> >  	}
> >  
> >  	sec->fwl = fwl;
> >  	return 0;
> > +
> > +fw_uploader_fail:
> > +	kfree(sec->fw_name);
> > +fw_name_fail:
> > +	xa_erase(&fw_upload_xa, sec->fw_name_id);
> > +	return ret;
> >  }
> >  
> >  static int m10bmc_sec_remove(struct platform_device *pdev)
> > -- 
> > 2.30.2
> > 
> 

--8323329-566868870-1672077484=:1690--