Skip to contentSkip to conversation

src: don't set data_len to zero when returning pointers

PATCH New Pablo Neira Ayuso 1 participant 1 message Aug 1, 2016 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 src: don't set data_len to zero when returning pointers

nft already assumes that passing NULL as data_len is valid, otherwise it crashes. Fix this by leave data_len unset in this specific case.

Fixes bda7102 ("src: Fix nftnl_*_get_data() to return the real attribute length")
---
 src/expr/dynset.c | 1 -
 src/set_elem.c    | 1 -
 2 files changed, 2 deletions(-)
src/expr/dynset.c +0 -1
index 111bf8c..0eaa409 100644
@@ -94,7 +94,6 @@ nftnl_expr_dynset_get(const struct nftnl_expr *e, uint16_t type,
 		*data_len = sizeof(dynset->set_id);
 		return &dynset->set_id;
 	case NFTNL_EXPR_DYNSET_EXPR:
-		*data_len = 0;
 		return dynset->expr;
 	}
 	return NULL;
src/set_elem.c +0 -1
index 4e89210..7908661 100644
@@ -184,7 +184,6 @@ const void *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t
 		*data_len = s->user.len;
 		return s->user.data;
 	case NFTNL_SET_ELEM_EXPR:
-		*data_len = 0;
 		return s->expr;
 	}
 	return NULL;
Signature · 1 line
2.1.4