matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
<builtin>: 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 <mt@debian.org>
Signed-off-by: Andreas Henriksson <andreas@fatal.se>
This commit is contained in:
Andreas Henriksson 2014-06-04 19:40:37 +02:00 committed by Stephen Hemminger
parent 0cb6bb51b4
commit 9dca899b2d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/fdb.c
View File

@ -27,7 +27,7 @@
#include "rt_names.h" #include "rt_names.h"
#include "utils.h" #include "utils.h"
int filter_index; static unsigned int filter_index;
static void usage(void) static void usage(void)
{ {

2
bridge/link.c
View File

@ -15,7 +15,7 @@
#include "utils.h" #include "utils.h"
#include "br_common.h" #include "br_common.h"
unsigned int filter_index; static unsigned int filter_index;
static const char *port_states[] = { static const char *port_states[] = {
[BR_STATE_DISABLED] = "disabled", [BR_STATE_DISABLED] = "disabled",

2
bridge/mdb.c
View File

@ -24,7 +24,7 @@
((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct br_port_msg)))) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct br_port_msg))))
#endif #endif
int filter_index; static unsigned int filter_index;
static void usage(void) static void usage(void)
{ {

2
bridge/vlan.c
View File

@ -13,7 +13,7 @@
#include "br_common.h" #include "br_common.h"
#include "utils.h" #include "utils.h"
int filter_index; static unsigned int filter_index;
static void usage(void) static void usage(void)
{ {