Skip to contentSkip to conversation

segtree: fix asan runtime error

PATCH New Pablo Neira Ayuso 1 participant 2 messages Jun 7, 2020 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/2 segtree: fix asan runtime error

ASAN reports:

segtree.c:387:30: runtime error: variable length array bound evaluates to non-positive value 0

Update array definition to be the set size plus 1.

---
 src/segtree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/segtree.c +2 -2
index 266a2b4dc98b..b6ca6083ea0b 100644
@@ -383,8 +383,8 @@ static bool interval_overlap(const struct elementary_interval *e1,
 static int set_overlap(struct list_head *msgs, const struct set *set,
 		       struct expr *init, unsigned int keylen, bool add)
 {
-	struct elementary_interval *new_intervals[init->size];
-	struct elementary_interval *intervals[set->init->size];
+	struct elementary_interval *new_intervals[init->size + 1];
+	struct elementary_interval *intervals[set->init->size + 1];
 	unsigned int n, m, i, j;
 	int ret = 0;
 
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

PATCH 2/2 meta: fix asan runtime error in tc handle

meta.c:92:17: runtime error: left shift of 34661 by 16 places cannot be represented in type 'int'

---
 src/meta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/meta.c +1 -1
index acc348eb264d..d92d0d323b9b 100644
@@ -73,7 +73,7 @@ static struct error_record *tchandle_type_parse(struct parse_ctx *ctx,
 	else if (strcmp(sym->identifier, "none") == 0)
 		handle = TC_H_UNSPEC;
 	else if (strchr(sym->identifier, ':')) {
-		uint16_t tmp;
+		uint32_t tmp;
 		char *colon;
 
 		str = xstrdup(sym->identifier);
Signature · 1 line
2.20.1