From: Kang Chen <[email protected]>
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 <[email protected]>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
Signed-off-by: Kang Chen <[email protected]>
---
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
On Fri, Feb 24, 2023 at 5:28 PM void0red <[email protected]> wrote:
>
> From: Kang Chen <[email protected]>
>
> 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 <[email protected]>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
>
> Signed-off-by: Kang Chen <[email protected]>
> ---
> 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
>
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 <[email protected]> 于2023年2月24日周五 19:06写道：
>
> On Fri, Feb 24, 2023 at 5:28 PM void0red <[email protected]> wrote:
> >
> > From: Kang Chen <[email protected]>
> >
> > 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 <[email protected]>
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> >
> > Signed-off-by: Kang Chen <[email protected]>
> > ---
> > 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
> >
From: Kang Chen <[email protected]>
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 <[email protected]>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
Signed-off-by: Kang Chen <[email protected]>
---
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
On Fri, Feb 24, 2023 at 09:02:35PM +0800, void0red wrote:
> From: Kang Chen <[email protected]>
>
> 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 <[email protected]>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
>
> Signed-off-by: Kang Chen <[email protected]>
> ---
> 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
On Fri, Feb 24, 2023 at 9:13 PM Greg KH <[email protected]> wrote:
>
> On Fri, Feb 24, 2023 at 09:02:35PM +0800, void0red wrote:
> > From: Kang Chen <[email protected]>
> >
> > 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 <[email protected]>
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
> >
> > Signed-off-by: Kang Chen <[email protected]>
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
From: Kang Chen <[email protected]>
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 <[email protected]>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
Signed-off-by: Kang Chen <[email protected]>
---
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
On Fri, Feb 24, 2023 at 10:11:01PM +0800, void0red wrote:
> From: Kang Chen <[email protected]>
>
> 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 <[email protected]>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
>
> Signed-off-by: Kang Chen <[email protected]>
> ---
> 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
From: Kang Chen <[email protected]>
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 <[email protected]>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
Signed-off-by: Kang Chen <[email protected]>
---
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
On Fri, Feb 24, 2023 at 10:31:48PM +0800, void0red wrote:
> From: Kang Chen <[email protected]>
>
> 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 <[email protected]>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
>
> Signed-off-by: Kang Chen <[email protected]>
> ---
> 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
Hello!
On 2/24/23 5:11 PM, void0red wrote:
> From: Kang Chen <[email protected]>
>
> 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 <[email protected]>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
>
> Signed-off-by: Kang Chen <[email protected]>
> ---
> 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
From: Kang Chen <[email protected]>
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 <[email protected]>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217081
Signed-off-by: Kang Chen <[email protected]>
---
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
From: Kang Chen <[email protected]>
This driver uses the unified memory management api, so replace
kzalloc with devm_kzalloc to avoid a memory leak.
Reported-by: Dongliang Mu <[email protected]>
Link: https://lore.kernel.org/all/CAD-N9QX5i5toj8cs7DxBjYWtRGf3ZRnfTAf809sFW6iX0Ktfmw@mail.gmail.com
Signed-off-by: Kang Chen <[email protected]>
---
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