[dpdk-dev] [PATCH] eal: fix build with gcc 4.7
Pablo de Lara
pablo.de.lara.guarch at intel.com
Mon Jul 16 08:26:27 CEST 2018
Fixed possible out-of-bounds issue:
lib/librte_eal/common/eal_common_devargs.c:
In function ‘rte_devargs_layers_parse’:
lib/librte_eal/common/eal_common_devargs.c:121:7:
error: array subscript is above array bounds
Bugzilla ID: 71
Fixes: 338327d731e6 ("devargs: add function to parse device layers")
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
lib/librte_eal/common/eal_common_devargs.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index a22a2002e..1a7b00ece 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -118,12 +118,17 @@ rte_devargs_layers_parse(struct rte_devargs *devargs,
}
while (s != NULL) {
- if (strncmp(layers[i].key, s,
- strlen(layers[i].key)) &&
- /* The last layer is free-form.
- * The "driver" key is not required (but accepted).
- */
- i != RTE_DIM(layers) - 1)
+ if (i >= RTE_DIM(layers)) {
+ RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s);
+ ret = -EINVAL;
+ goto get_out;
+ }
+ /*
+ * The last layer is free-form.
+ * The "driver" key is not required (but accepted).
+ */
+ if (strncmp(layers[i].key, s, strlen(layers[i].key)) &&
+ i != RTE_DIM(layers) - 1)
goto next_layer;
layers[i].str = s;
layers[i].kvlist = rte_kvargs_parse_delim(s, NULL, "/");
@@ -136,11 +141,6 @@ rte_devargs_layers_parse(struct rte_devargs *devargs,
if (s != NULL)
s++;
next_layer:
- if (i >= RTE_DIM(layers)) {
- RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s);
- ret = -EINVAL;
- goto get_out;
- }
i++;
}
--
2.14.4
More information about the dev
mailing list