All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback
@ 2022-12-14 14:49 Ilpo Järvinen
  2022-12-16  8:26 ` Xu Yilun
  2022-12-26  3:48 ` Xu Yilun
  0 siblings, 2 replies; 4+ messages in thread
From: Ilpo Järvinen @ 2022-12-14 14:49 UTC (permalink / raw)
  To: Russ Weight, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix,
	linux-fpga, linux-kernel
  Cc: Ilpo Järvinen, Matthew Gerlach, Marco Pagani

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 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback
  2022-12-14 14:49 [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback Ilpo Järvinen
@ 2022-12-16  8:26 ` Xu Yilun
  2022-12-26  3:48 ` Xu Yilun
  1 sibling, 0 replies; 4+ messages in thread
From: Xu Yilun @ 2022-12-16  8:26 UTC (permalink / raw)
  To: Ilpo Järvinen
  Cc: Russ Weight, Moritz Fischer, Wu Hao, Tom Rix, linux-fpga,
	linux-kernel, Matthew Gerlach, Marco Pagani

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 don't know if the previous one fell through cracks so resending this.

I'll pick this when v6.2-rc1 comes.

Acked-by: Xu Yilun <yilun.xu@intel.com>

> 
> 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
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback
  2022-12-14 14:49 [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback Ilpo Järvinen
  2022-12-16  8:26 ` Xu Yilun
@ 2022-12-26  3:48 ` Xu Yilun
  2022-12-26 17:57   ` Ilpo Järvinen
  1 sibling, 1 reply; 4+ messages in thread
From: Xu Yilun @ 2022-12-26  3:48 UTC (permalink / raw)
  To: Ilpo Järvinen
  Cc: Russ Weight, Moritz Fischer, Wu Hao, Tom Rix, linux-fpga,
	linux-kernel, Matthew Gerlach, Marco Pagani

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.

Thanks,
Yilun

> ---
> 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
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback
  2022-12-26  3:48 ` Xu Yilun
@ 2022-12-26 17:57   ` Ilpo Järvinen
  0 siblings, 0 replies; 4+ messages in thread
From: Ilpo Järvinen @ 2022-12-26 17:57 UTC (permalink / raw)
  To: Xu Yilun
  Cc: Russ Weight, Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, LKML,
	Matthew Gerlach, Marco Pagani

[-- Attachment #1: Type: text/plain, Size: 2243 bytes --]

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
> > 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-26 17:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-14 14:49 [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback Ilpo Järvinen
2022-12-16  8:26 ` Xu Yilun
2022-12-26  3:48 ` Xu Yilun
2022-12-26 17:57   ` Ilpo Järvinen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.