From: "Min Hu (Connor)" <humin29@huawei.com>
To: <dev@dpdk.org>
Cc: <ferruh.yigit@intel.com>, <humin29@huawei.com>
Subject: [dpdk-dev] [PATCH v4] net/bonding: fix socket id check
Date: Tue, 27 Apr 2021 19:39:41 +0800 [thread overview]
Message-ID: <1619523581-60870-1-git-send-email-humin29@huawei.com> (raw)
In-Reply-To: <1619075569-33619-1-git-send-email-humin29@huawei.com>
From: Chengchang Tang <tangchengchang@huawei.com>
The socket ID entered by user is cast to an unsigned integer. However,
the value may be an illegal negative value, which may cause some
problems. In this case, an error should be returned.
In addition, the socket ID may be an invalid positive number, which is
also processed in this patch.
Fixes: 2efb58cbab6e ("bond: new link bonding library")
Cc: stable@dpdk.org
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
v4:
* changed type of socket id getting from 'strtol'.
* delete unused comments.
v3:
* changed type of socket id.
v2:
* fixed socket id type.
---
drivers/net/bonding/rte_eth_bond_args.c | 8 ++++----
drivers/net/bonding/rte_eth_bond_pmd.c | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
index 8c5f90d..dc68e52 100644
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -200,20 +200,20 @@ int
bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused,
const char *value, void *extra_args)
{
- int socket_id;
+ long socket_id;
char *endptr;
if (value == NULL || extra_args == NULL)
return -1;
errno = 0;
- socket_id = (uint8_t)strtol(value, &endptr, 10);
+ socket_id = strtol(value, &endptr, 10);
if (*endptr != 0 || errno != 0)
return -1;
/* validate socket id value */
- if (socket_id >= 0) {
- *(uint8_t *)extra_args = (uint8_t)socket_id;
+ if (socket_id >= 0 && socket_id < RTE_MAX_NUMA_NODES) {
+ *(int *)extra_args = (int)socket_id;
return 0;
}
return -1;
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 2e9cea5..2f7d6ad 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3333,8 +3333,9 @@ bond_probe(struct rte_vdev_device *dev)
const char *name;
struct bond_dev_private *internals;
struct rte_kvargs *kvlist;
- uint8_t bonding_mode, socket_id/*, agg_mode*/;
- int arg_count, port_id;
+ uint8_t bonding_mode;
+ int arg_count, port_id;
+ int socket_id;
uint8_t agg_mode;
struct rte_eth_dev *eth_dev;
--
2.7.4
next prev parent reply other threads:[~2021-04-27 11:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 7:12 [dpdk-dev] [PATCH] " Min Hu (Connor)
2021-04-26 14:54 ` Ferruh Yigit
2021-04-27 2:44 ` Chengchang Tang
2021-04-27 10:45 ` Ferruh Yigit
2021-04-27 9:16 ` [dpdk-dev] [PATCH v2] " Min Hu (Connor)
2021-04-27 10:47 ` Ferruh Yigit
2021-04-27 11:39 ` Min Hu (Connor) [this message]
2021-04-27 12:51 ` [dpdk-dev] [PATCH v4] " Ferruh Yigit
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=1619523581-60870-1-git-send-email-humin29@huawei.com \
--to=humin29@huawei.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@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).