From 9dca899b2d97163f18b66c21b5e7acec893b0fa4 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Wed, 4 Jun 2014 19:40:37 +0200 Subject: [PATCH] bridge: Make filter_index match in signedness Michael Tautschnig wrote: During a rebuild [...]. Please note that we use our research compiler tool-chain (using tools from the cbmc package), which permits extended reporting on type inconsistencies at link time. [...] gcc bridge.o fdb.o monitor.o link.o mdb.o vlan.o ../lib/libnetlink.a ../lib/libutil.a ../lib/libnetlink.a ../lib/libutil.a -o bridge file link.c line 18: error: conflicting types for variable "filter_index" old definition in module fdb file fdb.c line 29 signed int new definition in module link file link.c line 18 unsigned int : recipe for target 'bridge' failed make[3]: *** [bridge] Error 64 make[3]: Leaving directory '/srv/jenkins-slave/workspace/sid-goto-cc-iproute2/iproute2-3.14.0/bridge' Makefile:45: recipe for target 'all' failed While practical constraints may limit the value of filter_index to remain within the bounds of a positive signed int, there is certainly no such guarantee here. Also, a plain majority vote suggests that this really just a wrong declaration in link.c as several declarations of filter_index as signed int exist. [...] My followup on this was: I think the majority is wrong. filter_index is assigned exclusively from if_nametoindex or ll_name_to_index which both return unsigned int. Changing it to unsigned everywhere seems better. This has been minimally tested by using the bridge tool to add vids and showing available vids on different devices. Reported-by: Michael Tautschnig Signed-off-by: Andreas Henriksson --- bridge/fdb.c | 2 +- bridge/link.c | 2 +- bridge/mdb.c | 2 +- bridge/vlan.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index 336cf9d7..cca99ef3 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -27,7 +27,7 @@ #include "rt_names.h" #include "utils.h" -int filter_index; +static unsigned int filter_index; static void usage(void) { diff --git a/bridge/link.c b/bridge/link.c index e3fd6e63..90d9e7f5 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -15,7 +15,7 @@ #include "utils.h" #include "br_common.h" -unsigned int filter_index; +static unsigned int filter_index; static const char *port_states[] = { [BR_STATE_DISABLED] = "disabled", diff --git a/bridge/mdb.c b/bridge/mdb.c index 81d479b9..6c1c938a 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -24,7 +24,7 @@ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct br_port_msg)))) #endif -int filter_index; +static unsigned int filter_index; static void usage(void) { diff --git a/bridge/vlan.c b/bridge/vlan.c index 83c40880..3bd7b0db 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -13,7 +13,7 @@ #include "br_common.h" #include "utils.h" -int filter_index; +static unsigned int filter_index; static void usage(void) {