On 08/13/2016 12:12 PM, Pablo Neira Ayuso wrote:
On Fri, Aug 12, 2016 at 10:17:19PM +0200, Carlos Falgueras García wrote:
Changes random values for macros because the conversion to string of these
values are performed by accessing to an array of strings.
Then, we should fix the functions to return "unknown" for out of bound
access of the array.
I think you have to fix this in the library, not the test.
The most common structure we have is this:
static const char *element2str_array[MAX_ELEMENTS] {
[ELEMENT_1] = "element 1",
...
[ELEMENT_N] = "element N",
};
static const char *element2str(uint32_t element) {
if (element < MAX_ELEMENT)
return "unkown";
return element2str_array[element];
}
I think it is better if we change it to a switch-case statement. I think
a switch-case have the same performance and it is more robust due cases
like this:
netfilter.h:
enum {
NFPROTO_UNSPEC = 0,
NFPROTO_INET = 1,
NFPROTO_IPV4 = 2,
NFPROTO_ARP = 3,
NFPROTO_NETDEV = 5,
NFPROTO_BRIDGE = 7,
NFPROTO_IPV6 = 10,
NFPROTO_DECNET = 12,
NFPROTO_NUMPROTO,
};
utils.c:
static const char *const nftnl_family_str[NFPROTO_NUMPROTO] = {
[NFPROTO_INET] = "inet",
[NFPROTO_IPV4] = "ip",
[NFPROTO_ARP] = "arp",
[NFPROTO_NETDEV] = "netdev",
[NFPROTO_BRIDGE] = "bridge",
[NFPROTO_IPV6] = "ip6",
};
We do not have all element in the translation table and elements have
unconsecutives values.
Another possible solution is something like this:
static const char *element2str(uint32_t element) {
- if (element < MAX_ELEMENT)
+ if (element < MAX_ELEMENT || !element2str_array[element])
return "unkown";
return element2str_array[element];
}
What do you think?
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
