From: "Li, Xiaoyun" <xiaoyun.li@intel.com>
To: "Min Hu (Connor)" <humin29@huawei.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "Yigit, Ferruh" <ferruh.yigit@intel.com>,
"Wu, Jingjing" <jingjing.wu@intel.com>
Subject: Re: [dpdk-dev] [PATCH 2/2] raw/ntb: check malloc result
Date: Wed, 21 Apr 2021 03:33:04 +0000 [thread overview]
Message-ID: <CH0PR11MB552366BD219ADB80005D21AD99479@CH0PR11MB5523.namprd11.prod.outlook.com> (raw)
In-Reply-To: <1618970896-37852-3-git-send-email-humin29@huawei.com>
Hi
> -----Original Message-----
> From: Min Hu (Connor) <humin29@huawei.com>
> Sent: Wednesday, April 21, 2021 10:08
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Li, Xiaoyun <xiaoyun.li@intel.com>;
> Wu, Jingjing <jingjing.wu@intel.com>
> Subject: [PATCH 2/2] raw/ntb: check malloc result
>
> From: Chengwen Feng <fengchengwen@huawei.com>
>
> This patch adds checking for rte_zmalloc() result when init intel ntb device, also
> fix the same bug when start ntb device.
>
> Fixes: 034c328eb025 ("raw/ntb: support Intel NTB")
> Fixes: c39d1e082a4b ("raw/ntb: setup queues")
> Cc: stable@dpdk.org
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> ---
> drivers/raw/ntb/ntb.c | 5 +++++
> drivers/raw/ntb/ntb_hw_intel.c | 5 +++++
> 2 files changed, 10 insertions(+)
>
> diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c index
> 0f0e3f2..6703bb5 100644
> --- a/drivers/raw/ntb/ntb.c
> +++ b/drivers/raw/ntb/ntb.c
> @@ -923,6 +923,11 @@ ntb_dev_start(struct rte_rawdev *dev)
>
> hw->peer_mw_base = rte_zmalloc("ntb_peer_mw_base", hw->mw_cnt
> *
> sizeof(uint64_t), 0);
> + if (hw->peer_mw_base == NULL) {
> + NTB_LOG(ERR, "Cannot allocate memory for peer mw base.");
> + ret = -ENOMEM;
> + goto err_q_init;
> + }
>
> if (hw->ntb_ops->spad_read == NULL) {
> ret = -ENOTSUP;
> diff --git a/drivers/raw/ntb/ntb_hw_intel.c b/drivers/raw/ntb/ntb_hw_intel.c
> index 4427e11..a742e8f 100644
> --- a/drivers/raw/ntb/ntb_hw_intel.c
> +++ b/drivers/raw/ntb/ntb_hw_intel.c
> @@ -148,6 +148,11 @@ intel_ntb_dev_init(const struct rte_rawdev *dev)
>
> hw->mw_size = rte_zmalloc("ntb_mw_size",
> hw->mw_cnt * sizeof(uint64_t), 0);
> + if (hw->mw_size == NULL) {
> + NTB_LOG(ERR, "Cannot allocate memory for mw size.");
> + return -ENOMEM;
> + }
> +
> for (i = 0; i < hw->mw_cnt; i++) {
> bar = intel_ntb_bar[i];
> hw->mw_size[i] = hw->pci_dev->mem_resource[bar].len;
> --
> 2.7.4
Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>
prev parent reply other threads:[~2021-04-21 3:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 2:08 [dpdk-dev] [PATCH 0/2] bugfix for raw ntb Min Hu (Connor)
2021-04-21 2:08 ` [dpdk-dev] [PATCH 1/2] raw/ntb: check spad user index Min Hu (Connor)
2021-04-21 3:31 ` Li, Xiaoyun
2021-04-21 3:54 ` fengchengwen
2021-04-21 4:36 ` Min Hu (Connor)
2021-04-21 4:54 ` Li, Xiaoyun
2021-04-21 6:08 ` Min Hu (Connor)
2021-05-05 20:37 ` Thomas Monjalon
2021-04-22 5:05 ` Li, Xiaoyun
2021-05-05 21:04 ` Thomas Monjalon
2021-04-21 2:08 ` [dpdk-dev] [PATCH 2/2] raw/ntb: check malloc result Min Hu (Connor)
2021-04-21 3:33 ` Li, Xiaoyun [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=CH0PR11MB552366BD219ADB80005D21AD99479@CH0PR11MB5523.namprd11.prod.outlook.com \
--to=xiaoyun.li@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=humin29@huawei.com \
--cc=jingjing.wu@intel.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).