[PATCH] ipmroute: Prevent overlapping storage of `filter` global

[PATCH] ipmroute: Prevent overlapping storage of `filter` global

[Michael Forney]

This variable has the same name as `struct xfrm_filter filter` in
ip/ipxfrm.c, but overrides that definition since `struct rtfilter`
is larger.

This is visible when built with -Wl,--warn-common in LDFLAGS:

	/usr/bin/ld: ipxfrm.o: warning: common of `filter' overridden by larger common from ipmroute.o

Signed-off-by: Michael Forney <mforney@mforney.org>
---
I'm not sure if this causes any problems in practice, but it seems
unintended.

 ip/ipmroute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 8b3c4c25..656ea0dc 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -46,7 +46,7 @@ static void usage(void)
 	exit(-1);
 }
 
-struct rtfilter {
+static struct rtfilter {
 	int tb;
 	int af;
 	int iif;
-- 
2.20.1

Re: [PATCH] ipmroute: Prevent overlapping storage of `filter` global

[Stephen Hemminger]

On Sun, 16 Jun 2019 14:46:02 -0700
Michael Forney <mforney@mforney.org> wrote:

> This variable has the same name as `struct xfrm_filter filter` in
> ip/ipxfrm.c, but overrides that definition since `struct rtfilter`
> is larger.
> 
> This is visible when built with -Wl,--warn-common in LDFLAGS:
> 
> 	/usr/bin/ld: ipxfrm.o: warning: common of `filter' overridden by larger common from ipmroute.o
> 
> Signed-off-by: Michael Forney <mforney@mforney.org>

Applied