linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe
@ 2023-02-24  9:20 void0red
  2023-02-24 11:03 ` Dongliang Mu
  0 siblings, 1 reply; 13+ messages in thread
From: void0red @ 2023-02-24  9:20 UTC (permalink / raw)
  To: gregkh; +Cc: linux-usb, linux-kernel, Kang Chen

From: Kang Chen <void0red@gmail.com>

Even an 8-byte kzalloc will fail when we don't have enough memory,
so we need a nullptr check and do the cleanup when it fails.

Reported-by: eriri <1527030098@qq.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081

Signed-off-by: Kang Chen <void0red@gmail.com>
---
 drivers/usb/gadget/udc/mv_udc_core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index b397f3a84..6dd6d52de 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -2230,6 +2230,10 @@ static int mv_udc_probe(struct platform_device *pdev)
 
 	/* allocate a small amount of memory to get valid address */
 	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
+	if (!udc->status_req->req.buf) {
+		retval = -ENOMEM;
+		goto err_destroy_dma;
+	}
 	udc->status_req->req.dma = DMA_ADDR_INVALID;
 
 	udc->resume_state = USB_STATE_NOTATTACHED;
-- 
2.34.1


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

* Re: [PATCH] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe
  2023-02-24  9:20 [PATCH] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe void0red
@ 2023-02-24 11:03 ` Dongliang Mu
  2023-02-24 12:43   ` Kang Chen
  2023-02-24 13:02   ` [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
  0 siblings, 2 replies; 13+ messages in thread
From: Dongliang Mu @ 2023-02-24 11:03 UTC (permalink / raw)
  To: void0red; +Cc: gregkh, linux-usb, linux-kernel

On Fri, Feb 24, 2023 at 5:28 PM void0red <void0red@gmail.com> wrote:
>
> From: Kang Chen <void0red@gmail.com>
>
> Even an 8-byte kzalloc will fail when we don't have enough memory,
> so we need a nullptr check and do the cleanup when it fails.
>
> Reported-by: eriri <1527030098@qq.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
>
> Signed-off-by: Kang Chen <void0red@gmail.com>
> ---
>  drivers/usb/gadget/udc/mv_udc_core.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> index b397f3a84..6dd6d52de 100644
> --- a/drivers/usb/gadget/udc/mv_udc_core.c
> +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> @@ -2230,6 +2230,10 @@ static int mv_udc_probe(struct platform_device *pdev)
>
>         /* allocate a small amount of memory to get valid address */
>         udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);

Hi Kang and gregkh,

I think there is a memory leak in this kzalloc. It seems there is no
deallocation for this allocated object.

As the surrounding allocation statements suggest,
we should turn kzalloc to devm_kzalloc.

> +       if (!udc->status_req->req.buf) {
> +               retval = -ENOMEM;
> +               goto err_destroy_dma;
> +       }
>         udc->status_req->req.dma = DMA_ADDR_INVALID;
>
>         udc->resume_state = USB_STATE_NOTATTACHED;
> --
> 2.34.1
>

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

* Re: [PATCH] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe
  2023-02-24 11:03 ` Dongliang Mu
@ 2023-02-24 12:43   ` Kang Chen
  2023-02-24 13:02   ` [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
  1 sibling, 0 replies; 13+ messages in thread
From: Kang Chen @ 2023-02-24 12:43 UTC (permalink / raw)
  To: Dongliang Mu; +Cc: gregkh, linux-usb, linux-kernel

Hi, Dongliang,

I totally agree with you. I checked the other drivers using
status_req->req.buf structure, they free the memory when
the driver removed. But in this driver, I can't find such code. So,
as you said, it needs a devm_kazlloc instead of a kzalloc to manage
the memory and avoid a memory leak.

Thanks for your correction. I will post a new patch later.

Dongliang Mu <mudongliangabcd@gmail.com> 于2023年2月24日周五 19:06写道:

>
> On Fri, Feb 24, 2023 at 5:28 PM void0red <void0red@gmail.com> wrote:
> >
> > From: Kang Chen <void0red@gmail.com>
> >
> > Even an 8-byte kzalloc will fail when we don't have enough memory,
> > so we need a nullptr check and do the cleanup when it fails.
> >
> > Reported-by: eriri <1527030098@qq.com>
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> >
> > Signed-off-by: Kang Chen <void0red@gmail.com>
> > ---
> >  drivers/usb/gadget/udc/mv_udc_core.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> > index b397f3a84..6dd6d52de 100644
> > --- a/drivers/usb/gadget/udc/mv_udc_core.c
> > +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> > @@ -2230,6 +2230,10 @@ static int mv_udc_probe(struct platform_device *pdev)
> >
> >         /* allocate a small amount of memory to get valid address */
> >         udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
>
> Hi Kang and gregkh,
>
> I think there is a memory leak in this kzalloc. It seems there is no
> deallocation for this allocated object.
>
> As the surrounding allocation statements suggest,
> we should turn kzalloc to devm_kzalloc.
>
> > +       if (!udc->status_req->req.buf) {
> > +               retval = -ENOMEM;
> > +               goto err_destroy_dma;
> > +       }
> >         udc->status_req->req.dma = DMA_ADDR_INVALID;
> >
> >         udc->resume_state = USB_STATE_NOTATTACHED;
> > --
> > 2.34.1
> >

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

* [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 11:03 ` Dongliang Mu
  2023-02-24 12:43   ` Kang Chen
@ 2023-02-24 13:02   ` void0red
  2023-02-24 13:13     ` Greg KH
  1 sibling, 1 reply; 13+ messages in thread
From: void0red @ 2023-02-24 13:02 UTC (permalink / raw)
  To: mudongliangabcd; +Cc: gregkh, linux-kernel, linux-usb, void0red, eriri

From: Kang Chen <void0red@gmail.com>

This driver uses the unified memory management api, so replace
kzalloc with devm_kzalloc to avoid a memory leak and add a check
for this allocation.

Reported-by: eriri <1527030098@qq.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081

Signed-off-by: Kang Chen <void0red@gmail.com>
---
 drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index b397f3a84..08474c08d 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&udc->status_req->queue);
 
 	/* allocate a small amount of memory to get valid address */
-	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
+	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
+	if (!udc->status_req->req.buf) {
+		retval = -ENOMEM;
+		goto err_destroy_dma;
+	}
 	udc->status_req->req.dma = DMA_ADDR_INVALID;
 
 	udc->resume_state = USB_STATE_NOTATTACHED;
-- 
2.34.1


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

* Re: [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 13:02   ` [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
@ 2023-02-24 13:13     ` Greg KH
  2023-02-24 13:14       ` Dongliang Mu
  0 siblings, 1 reply; 13+ messages in thread
From: Greg KH @ 2023-02-24 13:13 UTC (permalink / raw)
  To: void0red; +Cc: mudongliangabcd, linux-kernel, linux-usb, eriri

On Fri, Feb 24, 2023 at 09:02:35PM +0800, void0red wrote:
> From: Kang Chen <void0red@gmail.com>
> 
> This driver uses the unified memory management api, so replace
> kzalloc with devm_kzalloc to avoid a memory leak and add a check
> for this allocation.
> 
> Reported-by: eriri <1527030098@qq.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> 
> Signed-off-by: Kang Chen <void0red@gmail.com>
> ---
>  drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> index b397f3a84..08474c08d 100644
> --- a/drivers/usb/gadget/udc/mv_udc_core.c
> +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> @@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
>  	INIT_LIST_HEAD(&udc->status_req->queue);
>  
>  	/* allocate a small amount of memory to get valid address */
> -	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
> +	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
> +	if (!udc->status_req->req.buf) {
> +		retval = -ENOMEM;
> +		goto err_destroy_dma;
> +	}
>  	udc->status_req->req.dma = DMA_ADDR_INVALID;
>  
>  	udc->resume_state = USB_STATE_NOTATTACHED;
> -- 
> 2.34.1
> 

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
a patch that has triggered this response.  He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created.  Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.

You are receiving this message because of the following common error(s)
as indicated below:

- This looks like a new version of a previously submitted patch, but you
  did not list below the --- line any changes from the previous version.
  Please read the section entitled "The canonical patch format" in the
  kernel file, Documentation/process/submitting-patches.rst for what
  needs to be done here to properly describe this.

If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.

thanks,

greg k-h's patch email bot

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

* Re: [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 13:13     ` Greg KH
@ 2023-02-24 13:14       ` Dongliang Mu
  2023-02-24 14:11         ` [PATCH v2] " void0red
  2023-02-24 14:31         ` [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
  0 siblings, 2 replies; 13+ messages in thread
From: Dongliang Mu @ 2023-02-24 13:14 UTC (permalink / raw)
  To: Greg KH; +Cc: void0red, linux-kernel, linux-usb, eriri

On Fri, Feb 24, 2023 at 9:13 PM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Fri, Feb 24, 2023 at 09:02:35PM +0800, void0red wrote:
> > From: Kang Chen <void0red@gmail.com>
> >
> > This driver uses the unified memory management api, so replace
> > kzalloc with devm_kzalloc to avoid a memory leak and add a check
> > for this allocation.
> >
> > Reported-by: eriri <1527030098@qq.com>
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> >
> > Signed-off-by: Kang Chen <void0red@gmail.com>

Please remember to send a v2 patch. Otherwise, gregkh's bot will
notify you that this is an already-sent patch.

> > ---
> >  drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> > index b397f3a84..08474c08d 100644
> > --- a/drivers/usb/gadget/udc/mv_udc_core.c
> > +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> > @@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
> >       INIT_LIST_HEAD(&udc->status_req->queue);
> >
> >       /* allocate a small amount of memory to get valid address */
> > -     udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
> > +     udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
> > +     if (!udc->status_req->req.buf) {
> > +             retval = -ENOMEM;
> > +             goto err_destroy_dma;
> > +     }
> >       udc->status_req->req.dma = DMA_ADDR_INVALID;
> >
> >       udc->resume_state = USB_STATE_NOTATTACHED;
> > --
> > 2.34.1
> >
>
> Hi,
>
> This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
> a patch that has triggered this response.  He used to manually respond
> to these common problems, but in order to save his sanity (he kept
> writing the same thing over and over, yet to different people), I was
> created.  Hopefully you will not take offence and will fix the problem
> in your patch and resubmit it so that it can be accepted into the Linux
> kernel tree.
>
> You are receiving this message because of the following common error(s)
> as indicated below:
>
> - This looks like a new version of a previously submitted patch, but you
>   did not list below the --- line any changes from the previous version.
>   Please read the section entitled "The canonical patch format" in the
>   kernel file, Documentation/process/submitting-patches.rst for what
>   needs to be done here to properly describe this.
>
> If you wish to discuss this problem further, or you have questions about
> how to resolve this issue, please feel free to respond to this email and
> Greg will reply once he has dug out from the pending patches received
> from other developers.
>
> thanks,
>
> greg k-h's patch email bot

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

* [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 13:14       ` Dongliang Mu
@ 2023-02-24 14:11         ` void0red
  2023-02-24 14:19           ` Greg KH
  2023-02-24 17:01           ` Sergei Shtylyov
  2023-02-24 14:31         ` [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
  1 sibling, 2 replies; 13+ messages in thread
From: void0red @ 2023-02-24 14:11 UTC (permalink / raw)
  To: mudongliangabcd; +Cc: gregkh, linux-kernel, linux-usb, Kang Chen

From: Kang Chen <void0red@gmail.com>

This driver uses the unified memory management api, so replace
kzalloc with devm_kzalloc to avoid a memory leak and add a check
for this allocation.

Reported-by: eriri <1527030098@qq.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081

Signed-off-by: Kang Chen <void0red@gmail.com>
---
 drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index b397f3a84..08474c08d 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&udc->status_req->queue);
 
 	/* allocate a small amount of memory to get valid address */
-	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
+	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
+	if (!udc->status_req->req.buf) {
+		retval = -ENOMEM;
+		goto err_destroy_dma;
+	}
 	udc->status_req->req.dma = DMA_ADDR_INVALID;
 
 	udc->resume_state = USB_STATE_NOTATTACHED;
-- 
2.34.1


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

* Re: [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 14:11         ` [PATCH v2] " void0red
@ 2023-02-24 14:19           ` Greg KH
  2023-02-24 17:01           ` Sergei Shtylyov
  1 sibling, 0 replies; 13+ messages in thread
From: Greg KH @ 2023-02-24 14:19 UTC (permalink / raw)
  To: void0red; +Cc: mudongliangabcd, linux-kernel, linux-usb

On Fri, Feb 24, 2023 at 10:11:01PM +0800, void0red wrote:
> From: Kang Chen <void0red@gmail.com>
> 
> This driver uses the unified memory management api, so replace
> kzalloc with devm_kzalloc to avoid a memory leak and add a check
> for this allocation.
> 
> Reported-by: eriri <1527030098@qq.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> 
> Signed-off-by: Kang Chen <void0red@gmail.com>
> ---
>  drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> index b397f3a84..08474c08d 100644
> --- a/drivers/usb/gadget/udc/mv_udc_core.c
> +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> @@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
>  	INIT_LIST_HEAD(&udc->status_req->queue);
>  
>  	/* allocate a small amount of memory to get valid address */
> -	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
> +	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
> +	if (!udc->status_req->req.buf) {
> +		retval = -ENOMEM;
> +		goto err_destroy_dma;
> +	}
>  	udc->status_req->req.dma = DMA_ADDR_INVALID;
>  
>  	udc->resume_state = USB_STATE_NOTATTACHED;
> -- 
> 2.34.1
> 

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
a patch that has triggered this response.  He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created.  Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.

You are receiving this message because of the following common error(s)
as indicated below:

- This looks like a new version of a previously submitted patch, but you
  did not list below the --- line any changes from the previous version.
  Please read the section entitled "The canonical patch format" in the
  kernel file, Documentation/process/submitting-patches.rst for what
  needs to be done here to properly describe this.

If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.

thanks,

greg k-h's patch email bot

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

* [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 13:14       ` Dongliang Mu
  2023-02-24 14:11         ` [PATCH v2] " void0red
@ 2023-02-24 14:31         ` void0red
  2023-02-24 16:33           ` Greg KH
  1 sibling, 1 reply; 13+ messages in thread
From: void0red @ 2023-02-24 14:31 UTC (permalink / raw)
  To: mudongliangabcd; +Cc: gregkh, linux-kernel, linux-usb, Kang Chen

From: Kang Chen <void0red@gmail.com>

This driver uses the unified memory management api, so replace
kzalloc with devm_kzalloc to avoid a memory leak and add a check
for this allocation.

Reported-by: eriri <1527030098@qq.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081

Signed-off-by: Kang Chen <void0red@gmail.com>
---
v2 -> v1: replace kzalloc with devm_kzalloc

 drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index b397f3a84..08474c08d 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&udc->status_req->queue);
 
 	/* allocate a small amount of memory to get valid address */
-	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
+	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
+	if (!udc->status_req->req.buf) {
+		retval = -ENOMEM;
+		goto err_destroy_dma;
+	}
 	udc->status_req->req.dma = DMA_ADDR_INVALID;
 
 	udc->resume_state = USB_STATE_NOTATTACHED;
-- 
2.34.1


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

* Re: [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 14:31         ` [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
@ 2023-02-24 16:33           ` Greg KH
  0 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2023-02-24 16:33 UTC (permalink / raw)
  To: void0red; +Cc: mudongliangabcd, linux-kernel, linux-usb

On Fri, Feb 24, 2023 at 10:31:48PM +0800, void0red wrote:
> From: Kang Chen <void0red@gmail.com>
> 
> This driver uses the unified memory management api, so replace
> kzalloc with devm_kzalloc to avoid a memory leak and add a check
> for this allocation.
> 
> Reported-by: eriri <1527030098@qq.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> 
> Signed-off-by: Kang Chen <void0red@gmail.com>
> ---
> v2 -> v1: replace kzalloc with devm_kzalloc

I see 2 v2 patches on the mailing list, how am I supposed to know which
one is correct?

Please fix up and resend a v3.

thanks,

greg k-h

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

* Re: [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation.
  2023-02-24 14:11         ` [PATCH v2] " void0red
  2023-02-24 14:19           ` Greg KH
@ 2023-02-24 17:01           ` Sergei Shtylyov
  2023-02-25  4:11             ` [PATCH v3 1/2] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe void0red
  1 sibling, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2023-02-24 17:01 UTC (permalink / raw)
  To: void0red, mudongliangabcd; +Cc: gregkh, linux-kernel, linux-usb

Hello!

On 2/24/23 5:11 PM, void0red wrote:

> From: Kang Chen <void0red@gmail.com>
> 
> This driver uses the unified memory management api, so replace
> kzalloc with devm_kzalloc to avoid a memory leak and add a check
> for this allocation.

   IMHO these are 2 different problems and deserve its own patch
fixing it...

> Reported-by: eriri <1527030098@qq.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> 
> Signed-off-by: Kang Chen <void0red@gmail.com>
> ---
>  drivers/usb/gadget/udc/mv_udc_core.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
> index b397f3a84..08474c08d 100644
> --- a/drivers/usb/gadget/udc/mv_udc_core.c
> +++ b/drivers/usb/gadget/udc/mv_udc_core.c
> @@ -2229,7 +2229,11 @@ static int mv_udc_probe(struct platform_device *pdev)
>  	INIT_LIST_HEAD(&udc->status_req->queue);
>  
>  	/* allocate a small amount of memory to get valid address */
> -	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
> +	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
> +	if (!udc->status_req->req.buf) {
> +		retval = -ENOMEM;
> +		goto err_destroy_dma;
> +	}
>  	udc->status_req->req.dma = DMA_ADDR_INVALID;
>  
>  	udc->resume_state = USB_STATE_NOTATTACHED;

MBR, Sergey

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

* [PATCH v3 1/2] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe
  2023-02-24 17:01           ` Sergei Shtylyov
@ 2023-02-25  4:11             ` void0red
  2023-02-25  4:11               ` [PATCH v3 2/2] usb: gadget: udc: replace kzalloc with devm_kzalloc " void0red
  0 siblings, 1 reply; 13+ messages in thread
From: void0red @ 2023-02-25  4:11 UTC (permalink / raw)
  To: sergei.shtylyov
  Cc: gregkh, linux-kernel, linux-usb, mudongliangabcd, Kang Chen

From: Kang Chen <void0red@gmail.com>

Even an 8-byte kzalloc will fail when we don't have enough memory,
so we need a nullptr check and do the cleanup when it fails.

Reported-by: eriri <1527030098@qq.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081

Signed-off-by: Kang Chen <void0red@gmail.com>
---
v3 -> v2: split the patch into two
v2 -> v1: replace kzalloc with devm_kzalloc

 drivers/usb/gadget/udc/mv_udc_core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index b397f3a84..6dd6d52de 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -2230,6 +2230,10 @@ static int mv_udc_probe(struct platform_device *pdev)
 
 	/* allocate a small amount of memory to get valid address */
 	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
+	if (!udc->status_req->req.buf) {
+		retval = -ENOMEM;
+		goto err_destroy_dma;
+	}
 	udc->status_req->req.dma = DMA_ADDR_INVALID;
 
 	udc->resume_state = USB_STATE_NOTATTACHED;
-- 
2.34.1


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

* [PATCH v3 2/2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe
  2023-02-25  4:11             ` [PATCH v3 1/2] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe void0red
@ 2023-02-25  4:11               ` void0red
  0 siblings, 0 replies; 13+ messages in thread
From: void0red @ 2023-02-25  4:11 UTC (permalink / raw)
  To: sergei.shtylyov
  Cc: gregkh, linux-kernel, linux-usb, mudongliangabcd, Kang Chen

From: Kang Chen <void0red@gmail.com>

This driver uses the unified memory management api, so replace
kzalloc with devm_kzalloc to avoid a memory leak.

Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
Link: https://lore.kernel.org/all/CAD-N9QX5i5toj8cs7DxBjYWtRGf3ZRnfTAf809sFW6iX0Ktfmw@mail.gmail.com

Signed-off-by: Kang Chen <void0red@gmail.com>
---
v3 -> v2: split the patch into two
v2 -> v1: replace kzalloc with devm_kzalloc

 drivers/usb/gadget/udc/mv_udc_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index 6dd6d52de..08474c08d 100644
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -2229,7 +2229,7 @@ static int mv_udc_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&udc->status_req->queue);
 
 	/* allocate a small amount of memory to get valid address */
-	udc->status_req->req.buf = kzalloc(8, GFP_KERNEL);
+	udc->status_req->req.buf = devm_kzalloc(&pdev->dev, 8, GFP_KERNEL);
 	if (!udc->status_req->req.buf) {
 		retval = -ENOMEM;
 		goto err_destroy_dma;
-- 
2.34.1


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

end of thread, other threads:[~2023-02-25  4:12 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-24  9:20 [PATCH] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe void0red
2023-02-24 11:03 ` Dongliang Mu
2023-02-24 12:43   ` Kang Chen
2023-02-24 13:02   ` [PATCH] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
2023-02-24 13:13     ` Greg KH
2023-02-24 13:14       ` Dongliang Mu
2023-02-24 14:11         ` [PATCH v2] " void0red
2023-02-24 14:19           ` Greg KH
2023-02-24 17:01           ` Sergei Shtylyov
2023-02-25  4:11             ` [PATCH v3 1/2] usb: gadget: udc: add return value check of kzalloc in mv_udc_probe void0red
2023-02-25  4:11               ` [PATCH v3 2/2] usb: gadget: udc: replace kzalloc with devm_kzalloc " void0red
2023-02-24 14:31         ` [PATCH v2] usb: gadget: udc: replace kzalloc with devm_kzalloc in mv_udc_probe and add a check for this allocation void0red
2023-02-24 16:33           ` Greg KH

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