ntb.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] NTB: fix possible name leak in ntb_register_device()
@ 2023-12-01  3:30 Yang Yingliang
  2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Yang Yingliang @ 2023-12-01  3:30 UTC (permalink / raw)
  To: ntb, linux-pci
  Cc: jdmason, dave.jiang, allenbh, lpieralisi, kw, mani, kishon,
	bhelgaas, yangyingliang

From: Yang Yingliang <yangyingliang@huawei.com>

If device_register() returns error in ntb_register_device(),
the name allocated by dev_set_name() need be freed. As comment
of device_register() says, it should use put_device() to give
up the reference in the error path. So fix this by calling
put_device(), then the name can be freed in kobject_cleanup().

Remove the outside put_device() in pci_vntb_probe() and return
the error code.

Fixes: a1bd3baeb2f1 ("NTB: Add NTB hardware abstraction layer")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/ntb/core.c                            | 8 +++++++-
 drivers/pci/endpoint/functions/pci-epf-vntb.c | 6 +-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/ntb/core.c b/drivers/ntb/core.c
index 27dd93deff6e..d702bee78082 100644
--- a/drivers/ntb/core.c
+++ b/drivers/ntb/core.c
@@ -100,6 +100,8 @@ EXPORT_SYMBOL(ntb_unregister_client);
 
 int ntb_register_device(struct ntb_dev *ntb)
 {
+	int ret;
+
 	if (!ntb)
 		return -EINVAL;
 	if (!ntb->pdev)
@@ -120,7 +122,11 @@ int ntb_register_device(struct ntb_dev *ntb)
 	ntb->ctx_ops = NULL;
 	spin_lock_init(&ntb->ctx_lock);
 
-	return device_register(&ntb->dev);
+	ret = device_register(&ntb->dev);
+	if (ret)
+		put_device(&ntb->dev);
+
+	return ret;
 }
 EXPORT_SYMBOL(ntb_register_device);
 
diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 3f60128560ed..2b7bc5a731dd 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -1278,15 +1278,11 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	ret = ntb_register_device(&ndev->ntb);
 	if (ret) {
 		dev_err(dev, "Failed to register NTB device\n");
-		goto err_register_dev;
+		return ret;
 	}
 
 	dev_dbg(dev, "PCI Virtual NTB driver loaded\n");
 	return 0;
-
-err_register_dev:
-	put_device(&ndev->ntb.dev);
-	return -EINVAL;
 }
 
 static struct pci_device_id pci_vntb_table[] = {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe()
  2023-12-01  3:30 [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Yang Yingliang
@ 2023-12-01  3:30 ` Yang Yingliang
  2023-12-01  5:48   ` Manivannan Sadhasivam
                     ` (2 more replies)
  2023-12-01  5:48 ` [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Manivannan Sadhasivam
                   ` (3 subsequent siblings)
  4 siblings, 3 replies; 9+ messages in thread
From: Yang Yingliang @ 2023-12-01  3:30 UTC (permalink / raw)
  To: ntb, linux-pci
  Cc: jdmason, dave.jiang, allenbh, lpieralisi, kw, mani, kishon,
	bhelgaas, yangyingliang

From: Yang Yingliang <yangyingliang@huawei.com>

If dma_set_mask_and_coherent() fails, return the error code instead
of -EINVAL.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 2b7bc5a731dd..c6f07722cbac 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -1272,7 +1272,7 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
 	if (ret) {
 		dev_err(dev, "Cannot set DMA mask\n");
-		return -EINVAL;
+		return ret;
 	}
 
 	ret = ntb_register_device(&ndev->ntb);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/2] NTB: fix possible name leak in ntb_register_device()
  2023-12-01  3:30 [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Yang Yingliang
  2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
@ 2023-12-01  5:48 ` Manivannan Sadhasivam
  2023-12-01 17:41 ` Dave Jiang
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Manivannan Sadhasivam @ 2023-12-01  5:48 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: ntb, linux-pci, jdmason, dave.jiang, allenbh, lpieralisi, kw,
	kishon, bhelgaas, yangyingliang

On Fri, Dec 01, 2023 at 11:30:56AM +0800, Yang Yingliang wrote:
> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If device_register() returns error in ntb_register_device(),
> the name allocated by dev_set_name() need be freed. As comment
> of device_register() says, it should use put_device() to give
> up the reference in the error path. So fix this by calling
> put_device(), then the name can be freed in kobject_cleanup().
> 
> Remove the outside put_device() in pci_vntb_probe() and return
> the error code.
> 
> Fixes: a1bd3baeb2f1 ("NTB: Add NTB hardware abstraction layer")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

- Mani

> ---
>  drivers/ntb/core.c                            | 8 +++++++-
>  drivers/pci/endpoint/functions/pci-epf-vntb.c | 6 +-----
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/ntb/core.c b/drivers/ntb/core.c
> index 27dd93deff6e..d702bee78082 100644
> --- a/drivers/ntb/core.c
> +++ b/drivers/ntb/core.c
> @@ -100,6 +100,8 @@ EXPORT_SYMBOL(ntb_unregister_client);
>  
>  int ntb_register_device(struct ntb_dev *ntb)
>  {
> +	int ret;
> +
>  	if (!ntb)
>  		return -EINVAL;
>  	if (!ntb->pdev)
> @@ -120,7 +122,11 @@ int ntb_register_device(struct ntb_dev *ntb)
>  	ntb->ctx_ops = NULL;
>  	spin_lock_init(&ntb->ctx_lock);
>  
> -	return device_register(&ntb->dev);
> +	ret = device_register(&ntb->dev);
> +	if (ret)
> +		put_device(&ntb->dev);
> +
> +	return ret;
>  }
>  EXPORT_SYMBOL(ntb_register_device);
>  
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 3f60128560ed..2b7bc5a731dd 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -1278,15 +1278,11 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	ret = ntb_register_device(&ndev->ntb);
>  	if (ret) {
>  		dev_err(dev, "Failed to register NTB device\n");
> -		goto err_register_dev;
> +		return ret;
>  	}
>  
>  	dev_dbg(dev, "PCI Virtual NTB driver loaded\n");
>  	return 0;
> -
> -err_register_dev:
> -	put_device(&ndev->ntb.dev);
> -	return -EINVAL;
>  }
>  
>  static struct pci_device_id pci_vntb_table[] = {
> -- 
> 2.25.1
> 

-- 
மணிவண்ணன் சதாசிவம்

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe()
  2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
@ 2023-12-01  5:48   ` Manivannan Sadhasivam
  2023-12-01 17:41   ` Dave Jiang
  2023-12-05  9:59   ` Ilpo Järvinen
  2 siblings, 0 replies; 9+ messages in thread
From: Manivannan Sadhasivam @ 2023-12-01  5:48 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: ntb, linux-pci, jdmason, dave.jiang, allenbh, lpieralisi, kw,
	kishon, bhelgaas, yangyingliang

On Fri, Dec 01, 2023 at 11:30:57AM +0800, Yang Yingliang wrote:
> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If dma_set_mask_and_coherent() fails, return the error code instead
> of -EINVAL.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

- Mani

> ---
>  drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 2b7bc5a731dd..c6f07722cbac 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -1272,7 +1272,7 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
>  	if (ret) {
>  		dev_err(dev, "Cannot set DMA mask\n");
> -		return -EINVAL;
> +		return ret;
>  	}
>  
>  	ret = ntb_register_device(&ndev->ntb);
> -- 
> 2.25.1
> 

-- 
மணிவண்ணன் சதாசிவம்

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/2] NTB: fix possible name leak in ntb_register_device()
  2023-12-01  3:30 [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Yang Yingliang
  2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
  2023-12-01  5:48 ` [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Manivannan Sadhasivam
@ 2023-12-01 17:41 ` Dave Jiang
  2023-12-05  9:59 ` Ilpo Järvinen
  2024-02-16 10:45 ` Manivannan Sadhasivam
  4 siblings, 0 replies; 9+ messages in thread
From: Dave Jiang @ 2023-12-01 17:41 UTC (permalink / raw)
  To: Yang Yingliang, ntb, linux-pci
  Cc: jdmason, allenbh, lpieralisi, kw, mani, kishon, bhelgaas, yangyingliang



On 11/30/23 20:30, Yang Yingliang wrote:
> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If device_register() returns error in ntb_register_device(),
> the name allocated by dev_set_name() need be freed. As comment
> of device_register() says, it should use put_device() to give
> up the reference in the error path. So fix this by calling
> put_device(), then the name can be freed in kobject_cleanup().
> 
> Remove the outside put_device() in pci_vntb_probe() and return
> the error code.
> 
> Fixes: a1bd3baeb2f1 ("NTB: Add NTB hardware abstraction layer")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>  drivers/ntb/core.c                            | 8 +++++++-
>  drivers/pci/endpoint/functions/pci-epf-vntb.c | 6 +-----
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/ntb/core.c b/drivers/ntb/core.c
> index 27dd93deff6e..d702bee78082 100644
> --- a/drivers/ntb/core.c
> +++ b/drivers/ntb/core.c
> @@ -100,6 +100,8 @@ EXPORT_SYMBOL(ntb_unregister_client);
>  
>  int ntb_register_device(struct ntb_dev *ntb)
>  {
> +	int ret;
> +
>  	if (!ntb)
>  		return -EINVAL;
>  	if (!ntb->pdev)
> @@ -120,7 +122,11 @@ int ntb_register_device(struct ntb_dev *ntb)
>  	ntb->ctx_ops = NULL;
>  	spin_lock_init(&ntb->ctx_lock);
>  
> -	return device_register(&ntb->dev);
> +	ret = device_register(&ntb->dev);
> +	if (ret)
> +		put_device(&ntb->dev);
> +
> +	return ret;
>  }
>  EXPORT_SYMBOL(ntb_register_device);
>  
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 3f60128560ed..2b7bc5a731dd 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -1278,15 +1278,11 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	ret = ntb_register_device(&ndev->ntb);
>  	if (ret) {
>  		dev_err(dev, "Failed to register NTB device\n");
> -		goto err_register_dev;
> +		return ret;
>  	}
>  
>  	dev_dbg(dev, "PCI Virtual NTB driver loaded\n");
>  	return 0;
> -
> -err_register_dev:
> -	put_device(&ndev->ntb.dev);
> -	return -EINVAL;
>  }
>  
>  static struct pci_device_id pci_vntb_table[] = {

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe()
  2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
  2023-12-01  5:48   ` Manivannan Sadhasivam
@ 2023-12-01 17:41   ` Dave Jiang
  2023-12-05  9:59   ` Ilpo Järvinen
  2 siblings, 0 replies; 9+ messages in thread
From: Dave Jiang @ 2023-12-01 17:41 UTC (permalink / raw)
  To: Yang Yingliang, ntb, linux-pci
  Cc: jdmason, allenbh, lpieralisi, kw, mani, kishon, bhelgaas, yangyingliang



On 11/30/23 20:30, Yang Yingliang wrote:
> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If dma_set_mask_and_coherent() fails, return the error code instead
> of -EINVAL.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>  drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 2b7bc5a731dd..c6f07722cbac 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -1272,7 +1272,7 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
>  	if (ret) {
>  		dev_err(dev, "Cannot set DMA mask\n");
> -		return -EINVAL;
> +		return ret;
>  	}
>  
>  	ret = ntb_register_device(&ndev->ntb);

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/2] NTB: fix possible name leak in ntb_register_device()
  2023-12-01  3:30 [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Yang Yingliang
                   ` (2 preceding siblings ...)
  2023-12-01 17:41 ` Dave Jiang
@ 2023-12-05  9:59 ` Ilpo Järvinen
  2024-02-16 10:45 ` Manivannan Sadhasivam
  4 siblings, 0 replies; 9+ messages in thread
From: Ilpo Järvinen @ 2023-12-05  9:59 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: ntb, linux-pci, jdmason, dave.jiang, allenbh, lpieralisi, kw,
	mani, kishon, bhelgaas, yangyingliang

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

On Fri, 1 Dec 2023, Yang Yingliang wrote:

> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If device_register() returns error in ntb_register_device(),
> the name allocated by dev_set_name() need be freed. As comment
> of device_register() says, it should use put_device() to give
> up the reference in the error path. So fix this by calling
> put_device(), then the name can be freed in kobject_cleanup().
> 
> Remove the outside put_device() in pci_vntb_probe() and return
> the error code.
> 
> Fixes: a1bd3baeb2f1 ("NTB: Add NTB hardware abstraction layer")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

-- 
 i.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe()
  2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
  2023-12-01  5:48   ` Manivannan Sadhasivam
  2023-12-01 17:41   ` Dave Jiang
@ 2023-12-05  9:59   ` Ilpo Järvinen
  2 siblings, 0 replies; 9+ messages in thread
From: Ilpo Järvinen @ 2023-12-05  9:59 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: ntb, linux-pci, jdmason, dave.jiang, allenbh, lpieralisi, kw,
	mani, kishon, bhelgaas, yangyingliang

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

On Fri, 1 Dec 2023, Yang Yingliang wrote:

> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If dma_set_mask_and_coherent() fails, return the error code instead
> of -EINVAL.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 2b7bc5a731dd..c6f07722cbac 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -1272,7 +1272,7 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
>  	if (ret) {
>  		dev_err(dev, "Cannot set DMA mask\n");
> -		return -EINVAL;
> +		return ret;
>  	}
>  
>  	ret = ntb_register_device(&ndev->ntb);

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

-- 
 i.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/2] NTB: fix possible name leak in ntb_register_device()
  2023-12-01  3:30 [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Yang Yingliang
                   ` (3 preceding siblings ...)
  2023-12-05  9:59 ` Ilpo Järvinen
@ 2024-02-16 10:45 ` Manivannan Sadhasivam
  4 siblings, 0 replies; 9+ messages in thread
From: Manivannan Sadhasivam @ 2024-02-16 10:45 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: ntb, linux-pci, jdmason, dave.jiang, allenbh, lpieralisi, kw,
	mani, kishon, bhelgaas, yangyingliang

On Fri, Dec 01, 2023 at 11:30:56AM +0800, Yang Yingliang wrote:
> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> If device_register() returns error in ntb_register_device(),
> the name allocated by dev_set_name() need be freed. As comment
> of device_register() says, it should use put_device() to give
> up the reference in the error path. So fix this by calling
> put_device(), then the name can be freed in kobject_cleanup().
> 
> Remove the outside put_device() in pci_vntb_probe() and return
> the error code.
> 
> Fixes: a1bd3baeb2f1 ("NTB: Add NTB hardware abstraction layer")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Applied to pci/endpoint!

- Mani

> ---
>  drivers/ntb/core.c                            | 8 +++++++-
>  drivers/pci/endpoint/functions/pci-epf-vntb.c | 6 +-----
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/ntb/core.c b/drivers/ntb/core.c
> index 27dd93deff6e..d702bee78082 100644
> --- a/drivers/ntb/core.c
> +++ b/drivers/ntb/core.c
> @@ -100,6 +100,8 @@ EXPORT_SYMBOL(ntb_unregister_client);
>  
>  int ntb_register_device(struct ntb_dev *ntb)
>  {
> +	int ret;
> +
>  	if (!ntb)
>  		return -EINVAL;
>  	if (!ntb->pdev)
> @@ -120,7 +122,11 @@ int ntb_register_device(struct ntb_dev *ntb)
>  	ntb->ctx_ops = NULL;
>  	spin_lock_init(&ntb->ctx_lock);
>  
> -	return device_register(&ntb->dev);
> +	ret = device_register(&ntb->dev);
> +	if (ret)
> +		put_device(&ntb->dev);
> +
> +	return ret;
>  }
>  EXPORT_SYMBOL(ntb_register_device);
>  
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 3f60128560ed..2b7bc5a731dd 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -1278,15 +1278,11 @@ static int pci_vntb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  	ret = ntb_register_device(&ndev->ntb);
>  	if (ret) {
>  		dev_err(dev, "Failed to register NTB device\n");
> -		goto err_register_dev;
> +		return ret;
>  	}
>  
>  	dev_dbg(dev, "PCI Virtual NTB driver loaded\n");
>  	return 0;
> -
> -err_register_dev:
> -	put_device(&ndev->ntb.dev);
> -	return -EINVAL;
>  }
>  
>  static struct pci_device_id pci_vntb_table[] = {
> -- 
> 2.25.1
> 
> 

-- 
மணிவண்ணன் சதாசிவம்

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-02-16 10:45 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-01  3:30 [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Yang Yingliang
2023-12-01  3:30 ` [PATCH 2/2] NTB: EPF: return error code in the error path in pci_vntb_probe() Yang Yingliang
2023-12-01  5:48   ` Manivannan Sadhasivam
2023-12-01 17:41   ` Dave Jiang
2023-12-05  9:59   ` Ilpo Järvinen
2023-12-01  5:48 ` [PATCH 1/2] NTB: fix possible name leak in ntb_register_device() Manivannan Sadhasivam
2023-12-01 17:41 ` Dave Jiang
2023-12-05  9:59 ` Ilpo Järvinen
2024-02-16 10:45 ` Manivannan Sadhasivam

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).