From: gfree.wind@vip.163.com
To: dev@dpdk.org
Cc: Gao Feng <davidfgao@tencent.com>
Subject: [dpdk-dev] [PATCH] eal: Add the check for null peer pointer in mp request handler
Date: Wed, 5 Dec 2018 14:19:24 +0800 [thread overview]
Message-ID: <1543990764-32140-1-git-send-email-gfree.wind@vip.163.com> (raw)
From: Gao Feng <davidfgao@tencent.com>
Add the check for null peer pointer like the bundle pointer in the mp request
handler. They should follow same style. And add some logs for nomem cases.
Signed-off-by: Gao Feng <davidfgao@tencent.com>
---
lib/librte_eal/common/hotplug_mp.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/librte_eal/common/hotplug_mp.c
index 070e2e0..0d2996f 100644
--- a/lib/librte_eal/common/hotplug_mp.c
+++ b/lib/librte_eal/common/hotplug_mp.c
@@ -200,6 +200,11 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name)
* when it is ready.
*/
bundle->peer = strdup(peer);
+ if (bundle->peer == NULL) {
+ free(bundle);
+ RTE_LOG(ERR, EAL, "not enough memory\n");
+ return send_response_to_secondary(req, -ENOMEM, peer);
+ }
/**
* We are at IPC callback thread, sync IPC is not allowed due to
@@ -311,6 +316,7 @@ static void __handle_primary_request(void *param)
bundle = calloc(1, sizeof(*bundle));
if (bundle == NULL) {
+ RTE_LOG(ERR, EAL, "not enough memory\n");
resp->result = -ENOMEM;
ret = rte_mp_reply(&mp_resp, peer);
if (ret)
@@ -325,6 +331,15 @@ static void __handle_primary_request(void *param)
* when it is ready.
*/
bundle->peer = (void *)strdup(peer);
+ if (bundle->peer == NULL) {
+ RTE_LOG(ERR, EAL, "not enough memory\n");
+ free(bundle);
+ resp->result = -ENOMEM;
+ ret = rte_mp_reply(&mp_resp, peer);
+ if (ret)
+ RTE_LOG(ERR, EAL, "failed to send reply to primary request\n");
+ return ret;
+ }
/**
* We are at IPC callback thread, sync IPC is not allowed due to
--
1.8.3.1
next reply other threads:[~2018-12-05 6:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 6:19 gfree.wind [this message]
2018-12-10 16:41 ` Burakov, Anatoly
2018-12-19 22:45 ` Thomas Monjalon
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=1543990764-32140-1-git-send-email-gfree.wind@vip.163.com \
--to=gfree.wind@vip.163.com \
--cc=davidfgao@tencent.com \
--cc=dev@dpdk.org \
/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).