trafgen-libs = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-3.0) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnl-genl-3.0) \ -lm trafgen-objs = xmalloc.o \ die.o \ ioops.o \ privs.o \ proc.o \ dev.o \ irq.o \ link.o \ str.o \ sig.o \ sock.o \ mac80211.o \ ring_tx.o \ ring.o \ timer.o \ sysctl.o \ trafgen_lexer.yy.o \ trafgen_parser.tab.o \ trafgen.o trafgen-lex = trafgen_lexer.yy.o trafgen-yaac = trafgen_parser.tab.o trafgen-eflags = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-3.0) \ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --cflags libnl-genl-3.0) \ -I.. trafgen-confs = trafgen_stddef.h trafgen_post_install: $(Q)mv $(DESTDIR)$(ETCDIRE)/trafgen_stddef.h $(DESTDIR)$(ETCDIRE)/stddef.h trafgen_clean_custom: $(Q)$(call RM,$(BUILD_DIR)/*.h $(BUILD_DIR)/*.c)
net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>2017-02-07 12:46:46 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-07 14:05:30 -0500
commitbb580ad698aeb4e5455d701c228c50355f84c056 (patch)
treeb12d3d016cb536db67ab242539b7c9c5b10d9a92 /net
parent1f02b5f42f53af516c4f5f747390e66d7a8f0bfe (diff)
bridge: tunnel: fix attribute checks in br_parse_vlan_tunnel_info
These checks should go after the attributes have been parsed otherwise we're using tb uninitialized. Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support") Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_netlink_tunnel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c