From: Helge Deller <deller@gmx.de>
To: Li Qiong <liqiong@nfschina.com>,
"James E . J . Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org,
yuzhe <yuzhe@nfschina.com>
Subject: Re: [PATCH] parisc: handle failure of kmalloc in ccio_init_resources
Date: Fri, 19 Aug 2022 21:30:40 +0200 [thread overview]
Message-ID: <9ad5cdb5-3f72-1305-b509-d0f68943b618@gmx.de> (raw)
In-Reply-To: <20220819041510.75473-1-liqiong@nfschina.com>
On 8/19/22 06:15, Li Qiong wrote:
> As the possible failure of the kmalloc(), it should be better
> to fix this error path, check and return '-ENOMEM' error code.
>
> Signed-off-by: Li Qiong <liqiong@nfschina.com>
applied.
Thanks!
Helge
> ---
> drivers/parisc/ccio-dma.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
> index 9be007c9420f..f69ab90b5e22 100644
> --- a/drivers/parisc/ccio-dma.c
> +++ b/drivers/parisc/ccio-dma.c
> @@ -1380,15 +1380,17 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
> }
> }
>
> -static void __init ccio_init_resources(struct ioc *ioc)
> +static int __init ccio_init_resources(struct ioc *ioc)
> {
> struct resource *res = ioc->mmio_region;
> char *name = kmalloc(14, GFP_KERNEL);
> -
> + if (unlikely(!name))
> + return -ENOMEM;
> snprintf(name, 14, "GSC Bus [%d/]", ioc->hw_path);
>
> ccio_init_resource(res, name, &ioc->ioc_regs->io_io_low);
> ccio_init_resource(res + 1, name, &ioc->ioc_regs->io_io_low_hv);
> + return 0;
> }
>
> static int new_ioc_area(struct resource *res, unsigned long size,
> @@ -1543,7 +1545,10 @@ static int __init ccio_probe(struct parisc_device *dev)
> return -ENOMEM;
> }
> ccio_ioc_init(ioc);
> - ccio_init_resources(ioc);
> + if (ccio_init_resources(ioc)) {
> + kfree(ioc);
> + return -ENOMEM;
> + }
> hppa_dma_ops = &ccio_ops;
>
> hba = kzalloc(sizeof(*hba), GFP_KERNEL);
prev parent reply other threads:[~2022-08-19 19:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 4:15 [PATCH] parisc: handle failure of kmalloc in ccio_init_resources Li Qiong
2022-08-19 19:30 ` Helge Deller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9ad5cdb5-3f72-1305-b509-d0f68943b618@gmx.de \
--to=deller@gmx.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=liqiong@nfschina.com \
--cc=yuzhe@nfschina.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).