net/bonding: fix socket ID check

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>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
index 8c5f90dc63dfebe9040b94949dbb3fe67650eb6e..764b1b8c8ea5ea00aeff701104abf9daa9ceac96 100644 (file)
--- 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 25b1f771a1659f6b98520abd40775345d4a18471..6ba09c4d9e87ded29cbce5b37f09faec2a9cb329 100644 (file)
--- 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;