diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-25 22:27:12 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-27 10:35:07 +0100 |
| commit | 41175cec8407da4687493a9f74043656682d470a (patch) | |
| tree | 0480536d5861270c83edc43908cc9abe5da6eb69 /src | |
| parent | 19c3da8e70d32818b7267fc63b44441295e69567 (diff) | |
src: early attribute type validation in nft_*_attr_set
This allows us to remove the default case in the switch, which
show help to spot missing attribute support since gcc will spot
a compilation warning.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/chain.c | 5 | ||||
| -rw-r--r-- | src/rule.c | 5 | ||||
| -rw-r--r-- | src/set.c | 5 | ||||
| -rw-r--r-- | src/table.c | 11 |
4 files changed, 15 insertions, 11 deletions
diff --git a/src/chain.c b/src/chain.c index 34eb91d..19e7950 100644 --- a/src/chain.c +++ b/src/chain.c @@ -142,6 +142,9 @@ EXPORT_SYMBOL(nft_chain_attr_unset); void nft_chain_attr_set(struct nft_chain *c, uint16_t attr, const void *data) { + if (attr > NFT_CHAIN_ATTR_MAX) + return; + switch(attr) { case NFT_CHAIN_ATTR_NAME: strncpy(c->name, data, NFT_CHAIN_MAXNAMELEN); @@ -182,8 +185,6 @@ void nft_chain_attr_set(struct nft_chain *c, uint16_t attr, const void *data) c->type = strdup(data); break; - default: - return; } c->flags |= (1 << attr); } @@ -115,6 +115,9 @@ EXPORT_SYMBOL(nft_rule_attr_unset); void nft_rule_attr_set(struct nft_rule *r, uint16_t attr, const void *data) { + if (attr > NFT_RULE_ATTR_MAX) + return; + switch(attr) { case NFT_RULE_ATTR_TABLE: if (r->table) @@ -143,8 +146,6 @@ void nft_rule_attr_set(struct nft_rule *r, uint16_t attr, const void *data) case NFT_RULE_ATTR_POSITION: r->position = *((uint64_t *)data); break; - default: - return; } r->flags |= (1 << attr); } @@ -98,6 +98,9 @@ EXPORT_SYMBOL(nft_set_attr_unset); void nft_set_attr_set(struct nft_set *s, uint16_t attr, const void *data) { + if (attr > NFT_SET_ATTR_MAX) + return; + switch(attr) { case NFT_SET_ATTR_TABLE: if (s->table) @@ -129,8 +132,6 @@ void nft_set_attr_set(struct nft_set *s, uint16_t attr, const void *data) case NFT_SET_ATTR_FAMILY: s->family = *((uint32_t *)data); break; - default: - return; } s->flags |= (1 << attr); } diff --git a/src/table.c b/src/table.c index c834a4e..af4b13c 100644 --- a/src/table.c +++ b/src/table.c @@ -81,26 +81,27 @@ EXPORT_SYMBOL(nft_table_attr_unset); void nft_table_attr_set(struct nft_table *t, uint16_t attr, const void *data) { + if (attr > NFT_TABLE_ATTR_MAX) + return; + switch (attr) { case NFT_TABLE_ATTR_NAME: if (t->name) xfree(t->name); t->name = strdup(data); - t->flags |= (1 << NFT_TABLE_ATTR_NAME); break; case NFT_TABLE_ATTR_FLAGS: t->table_flags = *((uint32_t *)data); - t->flags |= (1 << NFT_TABLE_ATTR_FLAGS); break; case NFT_TABLE_ATTR_FAMILY: t->family = *((uint8_t *)data); - t->flags |= (1 << NFT_TABLE_ATTR_FAMILY); break; case NFT_TABLE_ATTR_USE: - /* Cannot be unset, ignoring it */ - break; + /* Cannot be set, ignoring it */ + return; } + t->flags |= (1 << attr); } EXPORT_SYMBOL(nft_table_attr_set); |