Merge 674adedb8f into 25ea202925
This commit is contained in:
Sven Eckelmann
GitHub
commit
413d2b8329
16 changed files with 229 additions and 670 deletions
|
|
@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
|
||||||
# The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
|
# The latest alfred git hash in PKG_REV can be obtained from https://git.open-mesh.org/alfred.git
|
||||||
#
|
#
|
||||||
PKG_NAME:=alfred
|
PKG_NAME:=alfred
|
||||||
PKG_VERSION:=2016.2
|
PKG_VERSION:=2016.3
|
||||||
PKG_RELEASE:=0
|
PKG_RELEASE:=0
|
||||||
PKG_MD5SUM:=cc7d5b352942477033a4cafbed84152d
|
PKG_MD5SUM:=8a33199b8926a960889d1cf08535ef63
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
||||||
|
|
@ -28,7 +28,7 @@ define Package/alfred
|
||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
|
TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon
|
||||||
DEPENDS:= +libc @IPV6 +librt \
|
DEPENDS:= +libc @IPV6 +libnl-tiny +librt \
|
||||||
+ALFRED_NEEDS_lua:lua \
|
+ALFRED_NEEDS_lua:lua \
|
||||||
+ALFRED_NEEDS_libgps:libgps
|
+ALFRED_NEEDS_libgps:libgps
|
||||||
endef
|
endef
|
||||||
|
|
@ -60,10 +60,13 @@ endef
|
||||||
MAKE_ALFRED_FLAGS=\
|
MAKE_ALFRED_FLAGS=\
|
||||||
CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) \
|
CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) \
|
||||||
CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \
|
CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \
|
||||||
CONFIG_ALFRED_CAPABILITIES=n
|
CONFIG_ALFRED_CAPABILITIES=n \
|
||||||
|
LIBNL_NAME="libnl-tiny" \
|
||||||
|
LIBNL_GENL_NAME="libnl-tiny"
|
||||||
|
|
||||||
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
|
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
|
||||||
TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin
|
TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin
|
||||||
|
TARGET_CPPFLAGS += -D_GNU_SOURCE
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
From 9729239306edd6c0d122b0222626988f44d9b1cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sven Eckelmann <sven@narfation.org>
|
||||||
|
Date: Thu, 22 Sep 2016 23:41:20 +0200
|
||||||
|
Subject: [PATCH] alfred: vis: Fix netlink function fallback
|
||||||
|
|
||||||
|
The netlink functions return -EOPNOTSUPP when the kernel doesn't support
|
||||||
|
the netlink command. The caller can then fall back to debugfs. So check for
|
||||||
|
-EOPNOTSUPP and not EOPNOTSUPP.
|
||||||
|
|
||||||
|
Fixes: bca55a86fecd ("alfred: vis: Add support for netlink")
|
||||||
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
||||||
|
---
|
||||||
|
vis/vis.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/vis/vis.c b/vis/vis.c
|
||||||
|
index b865508..677f8aa 100644
|
||||||
|
--- a/vis/vis.c
|
||||||
|
+++ b/vis/vis.c
|
||||||
|
@@ -361,7 +361,7 @@ static int parse_transtable_local(struct globals *globals)
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = parse_transtable_local_netlink(globals);
|
||||||
|
- if (ret != EOPNOTSUPP)
|
||||||
|
+ if (ret != -EOPNOTSUPP)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return parse_transtable_local_debugfs(globals);
|
||||||
|
@@ -602,7 +602,7 @@ static int parse_orig_list(struct globals *globals)
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = parse_orig_list_netlink(globals);
|
||||||
|
- if (ret != EOPNOTSUPP)
|
||||||
|
+ if (ret != -EOPNOTSUPP)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return parse_orig_list_debugfs(globals);
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
From: Sven Eckelmann <sven@narfation.org>
|
||||||
|
Date: Fri, 23 Sep 2016 15:45:12 +0200
|
||||||
|
Subject: [PATCH] alfred: vis: Fix direct neighbors detection with originator netlink query
|
||||||
|
|
||||||
|
Only entries in the originator table with the destination address equal to
|
||||||
|
the originator address should be handled by alfred as actual neighbors.
|
||||||
|
|
||||||
|
Fixes: bca55a86fecd ("alfred: vis: Add support for netlink")
|
||||||
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
||||||
|
---
|
||||||
|
vis/vis.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/vis/vis.c b/vis/vis.c
|
||||||
|
index 94e583e..f4d13c7 100644
|
||||||
|
--- a/vis/vis.c
|
||||||
|
+++ b/vis/vis.c
|
||||||
|
@@ -453,6 +453,7 @@ err:
|
||||||
|
|
||||||
|
static const int parse_orig_list_mandatory[] = {
|
||||||
|
BATADV_ATTR_ORIG_ADDRESS,
|
||||||
|
+ BATADV_ATTR_NEIGH_ADDRESS,
|
||||||
|
BATADV_ATTR_TQ,
|
||||||
|
BATADV_ATTR_HARD_IFINDEX,
|
||||||
|
};
|
||||||
|
@@ -466,6 +467,7 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
|
||||||
|
struct genlmsghdr *ghdr;
|
||||||
|
struct vis_list_entry *v_entry;
|
||||||
|
uint8_t *orig;
|
||||||
|
+ uint8_t *neigh;
|
||||||
|
uint8_t tq;
|
||||||
|
uint32_t hardif;
|
||||||
|
|
||||||
|
@@ -493,12 +495,16 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
|
||||||
|
return NL_OK;
|
||||||
|
|
||||||
|
orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]);
|
||||||
|
+ neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]);
|
||||||
|
tq = nla_get_u8(attrs[BATADV_ATTR_TQ]);
|
||||||
|
hardif = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]);
|
||||||
|
|
||||||
|
if (tq < 1)
|
||||||
|
return NL_OK;
|
||||||
|
|
||||||
|
+ if (memcmp(orig, neigh, ETH_ALEN) != 0)
|
||||||
|
+ return NL_OK;
|
||||||
|
+
|
||||||
|
v_entry = malloc(sizeof(*v_entry));
|
||||||
|
if (!v_entry)
|
||||||
|
return NL_OK;
|
||||||
|
|
@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=batctl
|
PKG_NAME:=batctl
|
||||||
|
|
||||||
PKG_VERSION:=2016.2
|
PKG_VERSION:=2016.3
|
||||||
PKG_RELEASE:=0
|
PKG_RELEASE:=0
|
||||||
PKG_MD5SUM:=50f42d06611afae58ccfcde502f94c1a
|
PKG_MD5SUM:=533cbbe981bd0e9fc9ec73ed59379960
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
||||||
|
|
@ -55,7 +55,8 @@ MAKE_BATCTL_ENV += \
|
||||||
CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
||||||
CFLAGS="$(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
LIBNL_NAME="libnl-tiny"
|
LIBNL_NAME="libnl-tiny" \
|
||||||
|
LIBNL_GENL_NAME="libnl-tiny"
|
||||||
|
|
||||||
MAKE_BATCTL_ARGS += \
|
MAKE_BATCTL_ARGS += \
|
||||||
REVISION="$(PKG_BATCTL_SHORTREV)" \
|
REVISION="$(PKG_BATCTL_SHORTREV)" \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,77 @@
|
||||||
|
From: Sven Eckelmann <sven@narfation.org>
|
||||||
|
Date: Sun, 4 Sep 2016 20:20:40 +0200
|
||||||
|
Subject: [PATCH] batctl: Work around uclibc collision for __unused
|
||||||
|
|
||||||
|
uclibc on 64 bit systems uses struct members called __unused. These
|
||||||
|
conflict with the definition of __unused in batctl. Such a conflict results
|
||||||
|
in a build error because the struct member will be replaced with the
|
||||||
|
__attribute__((unused)).
|
||||||
|
|
||||||
|
This can be avoided by renaming it to the Linux kernel name
|
||||||
|
"__maybe_unused".
|
||||||
|
|
||||||
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
||||||
|
---
|
||||||
|
genl.c | 4 ++--
|
||||||
|
main.h | 2 +-
|
||||||
|
tp_meter.c | 5 +++--
|
||||||
|
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/genl.c b/genl.c
|
||||||
|
index b6f66fd..36fc27e 100644
|
||||||
|
--- a/genl.c
|
||||||
|
+++ b/genl.c
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
|
||||||
|
#include "batman_adv.h"
|
||||||
|
|
||||||
|
-static int mcast_error_handler(struct sockaddr_nl *nla __unused,
|
||||||
|
+static int mcast_error_handler(struct sockaddr_nl *nla __maybe_unused,
|
||||||
|
struct nlmsgerr *err, void *arg)
|
||||||
|
{
|
||||||
|
int *ret = arg;
|
||||||
|
@@ -42,7 +42,7 @@ static int mcast_error_handler(struct sockaddr_nl *nla __unused,
|
||||||
|
return NL_STOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int mcast_ack_handler(struct nl_msg *msg __unused, void *arg)
|
||||||
|
+static int mcast_ack_handler(struct nl_msg *msg __maybe_unused, void *arg)
|
||||||
|
{
|
||||||
|
int *ret = arg;
|
||||||
|
*ret = 0;
|
||||||
|
diff --git a/main.h b/main.h
|
||||||
|
index 01f70e8..12c33b7 100644
|
||||||
|
--- a/main.h
|
||||||
|
+++ b/main.h
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define __packed __attribute((packed)) /* linux kernel compat */
|
||||||
|
-#define __unused __attribute__((unused))
|
||||||
|
+#define __maybe_unused __attribute__((unused))
|
||||||
|
#define BIT(nr) (1UL << (nr)) /* linux kernel compat */
|
||||||
|
|
||||||
|
typedef uint8_t u8; /* linux kernel compat */
|
||||||
|
diff --git a/tp_meter.c b/tp_meter.c
|
||||||
|
index 43c19da..a402e45 100644
|
||||||
|
--- a/tp_meter.c
|
||||||
|
+++ b/tp_meter.c
|
||||||
|
@@ -66,7 +66,7 @@ struct tp_cookie {
|
||||||
|
uint32_t cookie;
|
||||||
|
};
|
||||||
|
|
||||||
|
-static int tpmeter_nl_print_error(struct sockaddr_nl *nla __unused,
|
||||||
|
+static int tpmeter_nl_print_error(struct sockaddr_nl *nla __maybe_unused,
|
||||||
|
struct nlmsgerr *nlerr,
|
||||||
|
void *arg)
|
||||||
|
{
|
||||||
|
@@ -236,7 +236,8 @@ out:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int no_seq_check(struct nl_msg *msg __unused, void *arg __unused)
|
||||||
|
+static int no_seq_check(struct nl_msg *msg __maybe_unused,
|
||||||
|
+ void *arg __maybe_unused)
|
||||||
|
{
|
||||||
|
return NL_OK;
|
||||||
|
}
|
||||||
|
|
@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=batman-adv
|
PKG_NAME:=batman-adv
|
||||||
|
|
||||||
PKG_VERSION:=2016.2
|
PKG_VERSION:=2016.3
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=0
|
||||||
PKG_MD5SUM:=dd1ab664475902fc3dbf34998bbe5a90
|
PKG_MD5SUM:=63f530a62c3d48ed0c7e42f47dfa4d4d
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
||||||
|
|
@ -66,11 +66,18 @@ NOSTDINC_FLAGS = \
|
||||||
-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
|
-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
|
||||||
-I$(STAGING_DIR)/usr/include/mac80211 \
|
-I$(STAGING_DIR)/usr/include/mac80211 \
|
||||||
-I$(STAGING_DIR)/usr/include/mac80211/uapi \
|
-I$(STAGING_DIR)/usr/include/mac80211/uapi \
|
||||||
|
-I$(PKG_BUILD_DIR)/include/ \
|
||||||
-include backport/backport.h \
|
-include backport/backport.h \
|
||||||
-include $(PKG_BUILD_DIR)/compat-hacks.h
|
-include $(PKG_BUILD_DIR)/compat-hacks.h
|
||||||
|
|
||||||
|
COMPAT_SOURCES = \
|
||||||
|
$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \
|
||||||
|
$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \
|
||||||
|
$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
|
+env "batman-adv-y=$(COMPAT_SOURCES)" \
|
||||||
|
$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
|
||||||
ARCH="$(LINUX_KARCH)" \
|
ARCH="$(LINUX_KARCH)" \
|
||||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||||
SUBDIRS="$(PKG_BUILD_DIR)/net/batman-adv" \
|
SUBDIRS="$(PKG_BUILD_DIR)/net/batman-adv" \
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,17 @@
|
||||||
|
|
||||||
#endif /* < KERNEL_VERSION(4, 5, 0) */
|
#endif /* < KERNEL_VERSION(4, 5, 0) */
|
||||||
|
|
||||||
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
|
||||||
|
|
||||||
|
struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb,
|
||||||
|
unsigned int transport_len,
|
||||||
|
__sum16(*skb_chkf)(struct sk_buff *skb));
|
||||||
|
|
||||||
|
int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed);
|
||||||
|
|
||||||
|
int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed);
|
||||||
|
|
||||||
|
#endif /* < KERNEL_VERSION(4, 2, 0) */
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Sat, 2 Jul 2016 09:52:13 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag
|
|
||||||
|
|
||||||
vlan_insert_tag can return NULL on errors. The bridge loop avoidance code
|
|
||||||
therefore has to check the return value of vlan_insert_tag for NULL before
|
|
||||||
it can safely operate on this pointer.
|
|
||||||
|
|
||||||
Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e4cffba4d3353ea15287abbfbdd65208aa62c156
|
|
||||||
---
|
|
||||||
net/batman-adv/bridge_loop_avoidance.c | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
|
|
||||||
index 748a9ea..7129780 100644
|
|
||||||
--- a/net/batman-adv/bridge_loop_avoidance.c
|
|
||||||
+++ b/net/batman-adv/bridge_loop_avoidance.c
|
|
||||||
@@ -418,9 +418,12 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (vid & BATADV_VLAN_HAS_TAG)
|
|
||||||
+ if (vid & BATADV_VLAN_HAS_TAG) {
|
|
||||||
skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
|
|
||||||
vid & VLAN_VID_MASK);
|
|
||||||
+ if (!skb)
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
skb_reset_mac_header(skb);
|
|
||||||
skb->protocol = eth_type_trans(skb, soft_iface);
|
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
||||||
|
Date: Thu, 29 Sep 2016 17:22:58 +0200
|
||||||
|
Subject: [PATCH] batman-adv: Modify neigh_list only with rcu-list functions
|
||||||
|
|
||||||
|
The batadv_hard_iface::neigh_list is accessed via rcu based primitives.
|
||||||
|
Thus all operations done on it have to fulfill the requirements by RCU. So
|
||||||
|
using non-RCU mechanisms like hlist_add_head is not allowed because it
|
||||||
|
misses the barriers required to protect concurrent readers when accessing
|
||||||
|
the data behind the pointer.
|
||||||
|
|
||||||
|
Fixes: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface")
|
||||||
|
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
||||||
|
---
|
||||||
|
net/batman-adv/originator.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
|
||||||
|
index 3940b5d..3e9667e 100644
|
||||||
|
--- a/net/batman-adv/originator.c
|
||||||
|
+++ b/net/batman-adv/originator.c
|
||||||
|
@@ -537,7 +537,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,
|
||||||
|
if (bat_priv->algo_ops->neigh.hardif_init)
|
||||||
|
bat_priv->algo_ops->neigh.hardif_init(hardif_neigh);
|
||||||
|
|
||||||
|
- hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list);
|
||||||
|
+ hlist_add_head_rcu(&hardif_neigh->list, &hard_iface->neigh_list);
|
||||||
|
|
||||||
|
out:
|
||||||
|
spin_unlock_bh(&hard_iface->neigh_list_lock);
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Sat, 2 Jul 2016 09:52:14 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Avoid nullptr dereference in dat after vlan_insert_tag
|
|
||||||
|
|
||||||
vlan_insert_tag can return NULL on errors. The distributed arp table code
|
|
||||||
therefore has to check the return value of vlan_insert_tag for NULL before
|
|
||||||
it can safely operate on this pointer.
|
|
||||||
|
|
||||||
Fixes: 53c6c262a581 ("batman-adv: tag locally generated ARP reply if needed")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/898382d11fa1f737cd4f7033db1088c601fd11ed
|
|
||||||
---
|
|
||||||
net/batman-adv/distributed-arp-table.c | 10 ++++++++--
|
|
||||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
|
|
||||||
index 278800a..aee3b39 100644
|
|
||||||
--- a/net/batman-adv/distributed-arp-table.c
|
|
||||||
+++ b/net/batman-adv/distributed-arp-table.c
|
|
||||||
@@ -1009,9 +1009,12 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
|
|
||||||
if (!skb_new)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
- if (vid & BATADV_VLAN_HAS_TAG)
|
|
||||||
+ if (vid & BATADV_VLAN_HAS_TAG) {
|
|
||||||
skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
|
|
||||||
vid & VLAN_VID_MASK);
|
|
||||||
+ if (!skb_new)
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
skb_reset_mac_header(skb_new);
|
|
||||||
skb_new->protocol = eth_type_trans(skb_new,
|
|
||||||
@@ -1089,9 +1092,12 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
|
|
||||||
*/
|
|
||||||
skb_reset_mac_header(skb_new);
|
|
||||||
|
|
||||||
- if (vid & BATADV_VLAN_HAS_TAG)
|
|
||||||
+ if (vid & BATADV_VLAN_HAS_TAG) {
|
|
||||||
skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
|
|
||||||
vid & VLAN_VID_MASK);
|
|
||||||
+ if (!skb_new)
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* To preserve backwards compatibility, the node has choose the outgoing
|
|
||||||
* format based on the incoming request packet type. The assumption is
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Fri, 24 Jun 2016 21:43:32 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Avoid tt_req_node list put for unhashed entry
|
|
||||||
|
|
||||||
It can happen that a tt_req_node list entry was already removed from
|
|
||||||
tt.req_list when batadv_send_tt_request reaches the end of the function.
|
|
||||||
The reference counter was already reduced by 1 for the list entry and thus
|
|
||||||
the reference counter is not allowed to be reduced again. Otherwise, the
|
|
||||||
entry is freed too early and the next batadv_tt_req_node_put in this
|
|
||||||
function will operate on freed memory.
|
|
||||||
|
|
||||||
Fixes: cea194d90b11 ("batman-adv: improved client announcement mechanism")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/03ecc9f957b837c755f09251c5f684996521e487
|
|
||||||
---
|
|
||||||
net/batman-adv/translation-table.c | 8 +++++---
|
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
|
|
||||||
index d033a05..57ec87f 100644
|
|
||||||
--- a/net/batman-adv/translation-table.c
|
|
||||||
+++ b/net/batman-adv/translation-table.c
|
|
||||||
@@ -2639,11 +2639,13 @@ static bool batadv_send_tt_request(struct batadv_priv *bat_priv,
|
|
||||||
out:
|
|
||||||
if (primary_if)
|
|
||||||
batadv_hardif_put(primary_if);
|
|
||||||
+
|
|
||||||
if (ret && tt_req_node) {
|
|
||||||
spin_lock_bh(&bat_priv->tt.req_list_lock);
|
|
||||||
- /* hlist_del_init() verifies tt_req_node still is in the list */
|
|
||||||
- hlist_del_init(&tt_req_node->list);
|
|
||||||
- batadv_tt_req_node_put(tt_req_node);
|
|
||||||
+ if (!hlist_unhashed(&tt_req_node->list)) {
|
|
||||||
+ hlist_del_init(&tt_req_node->list);
|
|
||||||
+ batadv_tt_req_node_put(tt_req_node);
|
|
||||||
+ }
|
|
||||||
spin_unlock_bh(&bat_priv->tt.req_list_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Thu, 30 Jun 2016 20:10:46 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Fix orig_node_vlan leak on orig_node_release
|
|
||||||
|
|
||||||
batadv_orig_node_new uses batadv_orig_node_vlan_new to allocate a new
|
|
||||||
batadv_orig_node_vlan and add it to batadv_orig_node::vlan_list. References
|
|
||||||
to this list have also to be cleaned when the batadv_orig_node is removed.
|
|
||||||
|
|
||||||
Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/719afd254e812c7ff8688ce79bebb7324ec438d6
|
|
||||||
---
|
|
||||||
net/batman-adv/originator.c | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
|
|
||||||
index 7f51bc2..fe2fcda 100644
|
|
||||||
--- a/net/batman-adv/originator.c
|
|
||||||
+++ b/net/batman-adv/originator.c
|
|
||||||
@@ -765,6 +765,7 @@ static void batadv_orig_node_release(struct kref *ref)
|
|
||||||
struct batadv_neigh_node *neigh_node;
|
|
||||||
struct batadv_orig_node *orig_node;
|
|
||||||
struct batadv_orig_ifinfo *orig_ifinfo;
|
|
||||||
+ struct batadv_orig_node_vlan *vlan;
|
|
||||||
|
|
||||||
orig_node = container_of(ref, struct batadv_orig_node, refcount);
|
|
||||||
|
|
||||||
@@ -784,6 +785,13 @@ static void batadv_orig_node_release(struct kref *ref)
|
|
||||||
}
|
|
||||||
spin_unlock_bh(&orig_node->neigh_list_lock);
|
|
||||||
|
|
||||||
+ spin_lock_bh(&orig_node->vlan_list_lock);
|
|
||||||
+ hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
|
|
||||||
+ hlist_del_rcu(&vlan->list);
|
|
||||||
+ batadv_orig_node_vlan_put(vlan);
|
|
||||||
+ }
|
|
||||||
+ spin_unlock_bh(&orig_node->vlan_list_lock);
|
|
||||||
+
|
|
||||||
/* Free nc_nodes */
|
|
||||||
batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);
|
|
||||||
|
|
||||||
|
|
@ -1,291 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Fri, 1 Jul 2016 15:49:43 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Fix non-atomic bla_claim::backbone_gw access
|
|
||||||
|
|
||||||
The pointer batadv_bla_claim::backbone_gw can be changed at any time.
|
|
||||||
Therefore, access to it must be protected to ensure that two function
|
|
||||||
accessing the same backbone_gw are actually accessing the same. This is
|
|
||||||
especially important when the crc_lock is used or when the backbone_gw of a
|
|
||||||
claim is exchanged.
|
|
||||||
|
|
||||||
Not doing so leads to invalid memory access and/or reference leaks.
|
|
||||||
|
|
||||||
Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
|
|
||||||
Fixes: b307e72d119f ("batman-adv: lock crc access in bridge loop avoidance")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e401297e3a393896e9b07bef8d6e2df203b60d43
|
|
||||||
---
|
|
||||||
net/batman-adv/bridge_loop_avoidance.c | 111 ++++++++++++++++++++++++++-------
|
|
||||||
net/batman-adv/types.h | 2 +
|
|
||||||
2 files changed, 90 insertions(+), 23 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
|
|
||||||
index 7129780..825a5cd 100644
|
|
||||||
--- a/net/batman-adv/bridge_loop_avoidance.c
|
|
||||||
+++ b/net/batman-adv/bridge_loop_avoidance.c
|
|
||||||
@@ -177,10 +177,21 @@ static void batadv_backbone_gw_put(struct batadv_bla_backbone_gw *backbone_gw)
|
|
||||||
static void batadv_claim_release(struct kref *ref)
|
|
||||||
{
|
|
||||||
struct batadv_bla_claim *claim;
|
|
||||||
+ struct batadv_bla_backbone_gw *old_backbone_gw;
|
|
||||||
|
|
||||||
claim = container_of(ref, struct batadv_bla_claim, refcount);
|
|
||||||
|
|
||||||
- batadv_backbone_gw_put(claim->backbone_gw);
|
|
||||||
+ spin_lock_bh(&claim->backbone_lock);
|
|
||||||
+ old_backbone_gw = claim->backbone_gw;
|
|
||||||
+ claim->backbone_gw = NULL;
|
|
||||||
+ spin_unlock_bh(&claim->backbone_lock);
|
|
||||||
+
|
|
||||||
+ spin_lock_bh(&old_backbone_gw->crc_lock);
|
|
||||||
+ old_backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
|
|
||||||
+ spin_unlock_bh(&old_backbone_gw->crc_lock);
|
|
||||||
+
|
|
||||||
+ batadv_backbone_gw_put(old_backbone_gw);
|
|
||||||
+
|
|
||||||
kfree_rcu(claim, rcu);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -677,8 +688,10 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
|
|
||||||
const u8 *mac, const unsigned short vid,
|
|
||||||
struct batadv_bla_backbone_gw *backbone_gw)
|
|
||||||
{
|
|
||||||
+ struct batadv_bla_backbone_gw *old_backbone_gw;
|
|
||||||
struct batadv_bla_claim *claim;
|
|
||||||
struct batadv_bla_claim search_claim;
|
|
||||||
+ bool remove_crc = false;
|
|
||||||
int hash_added;
|
|
||||||
|
|
||||||
ether_addr_copy(search_claim.addr, mac);
|
|
||||||
@@ -692,8 +705,10 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
|
|
||||||
return;
|
|
||||||
|
|
||||||
ether_addr_copy(claim->addr, mac);
|
|
||||||
+ spin_lock_init(&claim->backbone_lock);
|
|
||||||
claim->vid = vid;
|
|
||||||
claim->lasttime = jiffies;
|
|
||||||
+ kref_get(&backbone_gw->refcount);
|
|
||||||
claim->backbone_gw = backbone_gw;
|
|
||||||
|
|
||||||
kref_init(&claim->refcount);
|
|
||||||
@@ -721,15 +736,26 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
|
|
||||||
"bla_add_claim(): changing ownership for %pM, vid %d\n",
|
|
||||||
mac, BATADV_PRINT_VID(vid));
|
|
||||||
|
|
||||||
- spin_lock_bh(&claim->backbone_gw->crc_lock);
|
|
||||||
- claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
|
|
||||||
- spin_unlock_bh(&claim->backbone_gw->crc_lock);
|
|
||||||
- batadv_backbone_gw_put(claim->backbone_gw);
|
|
||||||
+ remove_crc = true;
|
|
||||||
}
|
|
||||||
- /* set (new) backbone gw */
|
|
||||||
+
|
|
||||||
+ /* replace backbone_gw atomically and adjust reference counters */
|
|
||||||
+ spin_lock_bh(&claim->backbone_lock);
|
|
||||||
+ old_backbone_gw = claim->backbone_gw;
|
|
||||||
kref_get(&backbone_gw->refcount);
|
|
||||||
claim->backbone_gw = backbone_gw;
|
|
||||||
+ spin_unlock_bh(&claim->backbone_lock);
|
|
||||||
|
|
||||||
+ if (remove_crc) {
|
|
||||||
+ /* remove claim address from old backbone_gw */
|
|
||||||
+ spin_lock_bh(&old_backbone_gw->crc_lock);
|
|
||||||
+ old_backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
|
|
||||||
+ spin_unlock_bh(&old_backbone_gw->crc_lock);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ batadv_backbone_gw_put(old_backbone_gw);
|
|
||||||
+
|
|
||||||
+ /* add claim address to new backbone_gw */
|
|
||||||
spin_lock_bh(&backbone_gw->crc_lock);
|
|
||||||
backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
|
|
||||||
spin_unlock_bh(&backbone_gw->crc_lock);
|
|
||||||
@@ -740,6 +766,26 @@ claim_free_ref:
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
+ * batadv_bla_claim_get_backbone_gw - Get valid reference for backbone_gw of
|
|
||||||
+ * claim
|
|
||||||
+ * @claim: claim whose backbone_gw should be returned
|
|
||||||
+ *
|
|
||||||
+ * Return: valid reference to claim::backbone_gw
|
|
||||||
+ */
|
|
||||||
+static struct batadv_bla_backbone_gw *
|
|
||||||
+batadv_bla_claim_get_backbone_gw(struct batadv_bla_claim *claim)
|
|
||||||
+{
|
|
||||||
+ struct batadv_bla_backbone_gw *backbone_gw;
|
|
||||||
+
|
|
||||||
+ spin_lock_bh(&claim->backbone_lock);
|
|
||||||
+ backbone_gw = claim->backbone_gw;
|
|
||||||
+ kref_get(&backbone_gw->refcount);
|
|
||||||
+ spin_unlock_bh(&claim->backbone_lock);
|
|
||||||
+
|
|
||||||
+ return backbone_gw;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
* batadv_bla_del_claim - delete a claim from the claim hash
|
|
||||||
* @bat_priv: the bat priv with all the soft interface information
|
|
||||||
* @mac: mac address of the claim to be removed
|
|
||||||
@@ -763,10 +809,6 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
|
|
||||||
batadv_choose_claim, claim);
|
|
||||||
batadv_claim_put(claim); /* reference from the hash is gone */
|
|
||||||
|
|
||||||
- spin_lock_bh(&claim->backbone_gw->crc_lock);
|
|
||||||
- claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
|
|
||||||
- spin_unlock_bh(&claim->backbone_gw->crc_lock);
|
|
||||||
-
|
|
||||||
/* don't need the reference from hash_find() anymore */
|
|
||||||
batadv_claim_put(claim);
|
|
||||||
}
|
|
||||||
@@ -1219,6 +1261,7 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
|
|
||||||
struct batadv_hard_iface *primary_if,
|
|
||||||
int now)
|
|
||||||
{
|
|
||||||
+ struct batadv_bla_backbone_gw *backbone_gw;
|
|
||||||
struct batadv_bla_claim *claim;
|
|
||||||
struct hlist_head *head;
|
|
||||||
struct batadv_hashtable *hash;
|
|
||||||
@@ -1233,14 +1276,17 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
|
|
||||||
|
|
||||||
rcu_read_lock();
|
|
||||||
hlist_for_each_entry_rcu(claim, head, hash_entry) {
|
|
||||||
+ backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
|
|
||||||
if (now)
|
|
||||||
goto purge_now;
|
|
||||||
- if (!batadv_compare_eth(claim->backbone_gw->orig,
|
|
||||||
+
|
|
||||||
+ if (!batadv_compare_eth(backbone_gw->orig,
|
|
||||||
primary_if->net_dev->dev_addr))
|
|
||||||
- continue;
|
|
||||||
+ goto skip;
|
|
||||||
+
|
|
||||||
if (!batadv_has_timed_out(claim->lasttime,
|
|
||||||
BATADV_BLA_CLAIM_TIMEOUT))
|
|
||||||
- continue;
|
|
||||||
+ goto skip;
|
|
||||||
|
|
||||||
batadv_dbg(BATADV_DBG_BLA, bat_priv,
|
|
||||||
"bla_purge_claims(): %pM, vid %d, time out\n",
|
|
||||||
@@ -1248,8 +1294,10 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
|
|
||||||
|
|
||||||
purge_now:
|
|
||||||
batadv_handle_unclaim(bat_priv, primary_if,
|
|
||||||
- claim->backbone_gw->orig,
|
|
||||||
+ backbone_gw->orig,
|
|
||||||
claim->addr, claim->vid);
|
|
||||||
+skip:
|
|
||||||
+ batadv_backbone_gw_put(backbone_gw);
|
|
||||||
}
|
|
||||||
rcu_read_unlock();
|
|
||||||
}
|
|
||||||
@@ -1760,9 +1808,11 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
||||||
bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
||||||
unsigned short vid, bool is_bcast)
|
|
||||||
{
|
|
||||||
+ struct batadv_bla_backbone_gw *backbone_gw;
|
|
||||||
struct ethhdr *ethhdr;
|
|
||||||
struct batadv_bla_claim search_claim, *claim = NULL;
|
|
||||||
struct batadv_hard_iface *primary_if;
|
|
||||||
+ bool own_claim;
|
|
||||||
bool ret;
|
|
||||||
|
|
||||||
ethhdr = eth_hdr(skb);
|
|
||||||
@@ -1797,8 +1847,12 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if it is our own claim ... */
|
|
||||||
- if (batadv_compare_eth(claim->backbone_gw->orig,
|
|
||||||
- primary_if->net_dev->dev_addr)) {
|
|
||||||
+ backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
|
|
||||||
+ own_claim = batadv_compare_eth(backbone_gw->orig,
|
|
||||||
+ primary_if->net_dev->dev_addr);
|
|
||||||
+ batadv_backbone_gw_put(backbone_gw);
|
|
||||||
+
|
|
||||||
+ if (own_claim) {
|
|
||||||
/* ... allow it in any case */
|
|
||||||
claim->lasttime = jiffies;
|
|
||||||
goto allow;
|
|
||||||
@@ -1862,7 +1916,9 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
||||||
{
|
|
||||||
struct ethhdr *ethhdr;
|
|
||||||
struct batadv_bla_claim search_claim, *claim = NULL;
|
|
||||||
+ struct batadv_bla_backbone_gw *backbone_gw;
|
|
||||||
struct batadv_hard_iface *primary_if;
|
|
||||||
+ bool client_roamed;
|
|
||||||
bool ret = false;
|
|
||||||
|
|
||||||
primary_if = batadv_primary_if_get_selected(bat_priv);
|
|
||||||
@@ -1892,8 +1948,12 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
||||||
goto allow;
|
|
||||||
|
|
||||||
/* check if we are responsible. */
|
|
||||||
- if (batadv_compare_eth(claim->backbone_gw->orig,
|
|
||||||
- primary_if->net_dev->dev_addr)) {
|
|
||||||
+ backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
|
|
||||||
+ client_roamed = batadv_compare_eth(backbone_gw->orig,
|
|
||||||
+ primary_if->net_dev->dev_addr);
|
|
||||||
+ batadv_backbone_gw_put(backbone_gw);
|
|
||||||
+
|
|
||||||
+ if (client_roamed) {
|
|
||||||
/* if yes, the client has roamed and we have
|
|
||||||
* to unclaim it.
|
|
||||||
*/
|
|
||||||
@@ -1941,6 +2001,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
|
|
||||||
struct net_device *net_dev = (struct net_device *)seq->private;
|
|
||||||
struct batadv_priv *bat_priv = netdev_priv(net_dev);
|
|
||||||
struct batadv_hashtable *hash = bat_priv->bla.claim_hash;
|
|
||||||
+ struct batadv_bla_backbone_gw *backbone_gw;
|
|
||||||
struct batadv_bla_claim *claim;
|
|
||||||
struct batadv_hard_iface *primary_if;
|
|
||||||
struct hlist_head *head;
|
|
||||||
@@ -1965,17 +2026,21 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
|
|
||||||
|
|
||||||
rcu_read_lock();
|
|
||||||
hlist_for_each_entry_rcu(claim, head, hash_entry) {
|
|
||||||
- is_own = batadv_compare_eth(claim->backbone_gw->orig,
|
|
||||||
+ backbone_gw = batadv_bla_claim_get_backbone_gw(claim);
|
|
||||||
+
|
|
||||||
+ is_own = batadv_compare_eth(backbone_gw->orig,
|
|
||||||
primary_addr);
|
|
||||||
|
|
||||||
- spin_lock_bh(&claim->backbone_gw->crc_lock);
|
|
||||||
- backbone_crc = claim->backbone_gw->crc;
|
|
||||||
- spin_unlock_bh(&claim->backbone_gw->crc_lock);
|
|
||||||
+ spin_lock_bh(&backbone_gw->crc_lock);
|
|
||||||
+ backbone_crc = backbone_gw->crc;
|
|
||||||
+ spin_unlock_bh(&backbone_gw->crc_lock);
|
|
||||||
seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",
|
|
||||||
claim->addr, BATADV_PRINT_VID(claim->vid),
|
|
||||||
- claim->backbone_gw->orig,
|
|
||||||
+ backbone_gw->orig,
|
|
||||||
(is_own ? 'x' : ' '),
|
|
||||||
backbone_crc);
|
|
||||||
+
|
|
||||||
+ batadv_backbone_gw_put(backbone_gw);
|
|
||||||
}
|
|
||||||
rcu_read_unlock();
|
|
||||||
}
|
|
||||||
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
|
|
||||||
index ba846b0..0051222 100644
|
|
||||||
--- a/net/batman-adv/types.h
|
|
||||||
+++ b/net/batman-adv/types.h
|
|
||||||
@@ -1042,6 +1042,7 @@ struct batadv_bla_backbone_gw {
|
|
||||||
* @addr: mac address of claimed non-mesh client
|
|
||||||
* @vid: vlan id this client was detected on
|
|
||||||
* @backbone_gw: pointer to backbone gw claiming this client
|
|
||||||
+ * @backbone_lock: lock protecting backbone_gw pointer
|
|
||||||
* @lasttime: last time we heard of claim (locals only)
|
|
||||||
* @hash_entry: hlist node for batadv_priv_bla::claim_hash
|
|
||||||
* @refcount: number of contexts the object is used
|
|
||||||
@@ -1051,6 +1052,7 @@ struct batadv_bla_claim {
|
|
||||||
u8 addr[ETH_ALEN];
|
|
||||||
unsigned short vid;
|
|
||||||
struct batadv_bla_backbone_gw *backbone_gw;
|
|
||||||
+ spinlock_t backbone_lock; /* protects backbone_gw */
|
|
||||||
unsigned long lasttime;
|
|
||||||
struct hlist_node hash_entry;
|
|
||||||
struct rcu_head rcu;
|
|
||||||
|
|
@ -1,120 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Thu, 30 Jun 2016 20:11:34 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Fix reference leak in batadv_find_router
|
|
||||||
|
|
||||||
The replacement of last_bonding_candidate in batadv_orig_node has to be an
|
|
||||||
atomic operation. Otherwise it is possible that the reference counter of a
|
|
||||||
batadv_orig_ifinfo is reduced which was no longer the
|
|
||||||
last_bonding_candidate when the new candidate is added. This can either
|
|
||||||
lead to an invalid memory access or to reference leaks which make it
|
|
||||||
impossible to an interface which was added to batman-adv.
|
|
||||||
|
|
||||||
Fixes: 797edd9e87ac ("batman-adv: add bonding again")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/6ecc711374afd93ee0c2216b38ae52d3ce680c3f
|
|
||||||
---
|
|
||||||
net/batman-adv/routing.c | 52 ++++++++++++++++++++++++++++++++++++------------
|
|
||||||
net/batman-adv/types.h | 4 +++-
|
|
||||||
2 files changed, 42 insertions(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
|
|
||||||
index 6c2901a..bfac086 100644
|
|
||||||
--- a/net/batman-adv/routing.c
|
|
||||||
+++ b/net/batman-adv/routing.c
|
|
||||||
@@ -456,6 +456,29 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
+ * batadv_last_bonding_replace - Replace last_bonding_candidate of orig_node
|
|
||||||
+ * @orig_node: originator node whose bonding candidates should be replaced
|
|
||||||
+ * @new_candidate: new bonding candidate or NULL
|
|
||||||
+ */
|
|
||||||
+static void
|
|
||||||
+batadv_last_bonding_replace(struct batadv_orig_node *orig_node,
|
|
||||||
+ struct batadv_orig_ifinfo *new_candidate)
|
|
||||||
+{
|
|
||||||
+ struct batadv_orig_ifinfo *old_candidate;
|
|
||||||
+
|
|
||||||
+ spin_lock_bh(&orig_node->neigh_list_lock);
|
|
||||||
+ old_candidate = orig_node->last_bonding_candidate;
|
|
||||||
+
|
|
||||||
+ if (new_candidate)
|
|
||||||
+ kref_get(&new_candidate->refcount);
|
|
||||||
+ orig_node->last_bonding_candidate = new_candidate;
|
|
||||||
+ spin_unlock_bh(&orig_node->neigh_list_lock);
|
|
||||||
+
|
|
||||||
+ if (old_candidate)
|
|
||||||
+ batadv_orig_ifinfo_put(old_candidate);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
* batadv_find_router - find a suitable router for this originator
|
|
||||||
* @bat_priv: the bat priv with all the soft interface information
|
|
||||||
* @orig_node: the destination node
|
|
||||||
@@ -562,10 +585,6 @@ next:
|
|
||||||
}
|
|
||||||
rcu_read_unlock();
|
|
||||||
|
|
||||||
- /* last_bonding_candidate is reset below, remove the old reference. */
|
|
||||||
- if (orig_node->last_bonding_candidate)
|
|
||||||
- batadv_orig_ifinfo_put(orig_node->last_bonding_candidate);
|
|
||||||
-
|
|
||||||
/* After finding candidates, handle the three cases:
|
|
||||||
* 1) there is a next candidate, use that
|
|
||||||
* 2) there is no next candidate, use the first of the list
|
|
||||||
@@ -574,21 +593,28 @@ next:
|
|
||||||
if (next_candidate) {
|
|
||||||
batadv_neigh_node_put(router);
|
|
||||||
|
|
||||||
- /* remove references to first candidate, we don't need it. */
|
|
||||||
- if (first_candidate) {
|
|
||||||
- batadv_neigh_node_put(first_candidate_router);
|
|
||||||
- batadv_orig_ifinfo_put(first_candidate);
|
|
||||||
- }
|
|
||||||
+ kref_get(&next_candidate_router->refcount);
|
|
||||||
router = next_candidate_router;
|
|
||||||
- orig_node->last_bonding_candidate = next_candidate;
|
|
||||||
+ batadv_last_bonding_replace(orig_node, next_candidate);
|
|
||||||
} else if (first_candidate) {
|
|
||||||
batadv_neigh_node_put(router);
|
|
||||||
|
|
||||||
- /* refcounting has already been done in the loop above. */
|
|
||||||
+ kref_get(&first_candidate_router->refcount);
|
|
||||||
router = first_candidate_router;
|
|
||||||
- orig_node->last_bonding_candidate = first_candidate;
|
|
||||||
+ batadv_last_bonding_replace(orig_node, first_candidate);
|
|
||||||
} else {
|
|
||||||
- orig_node->last_bonding_candidate = NULL;
|
|
||||||
+ batadv_last_bonding_replace(orig_node, NULL);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* cleanup of candidates */
|
|
||||||
+ if (first_candidate) {
|
|
||||||
+ batadv_neigh_node_put(first_candidate_router);
|
|
||||||
+ batadv_orig_ifinfo_put(first_candidate);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (next_candidate) {
|
|
||||||
+ batadv_neigh_node_put(next_candidate_router);
|
|
||||||
+ batadv_orig_ifinfo_put(next_candidate);
|
|
||||||
}
|
|
||||||
|
|
||||||
return router;
|
|
||||||
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
|
|
||||||
index 0051222..74d865a 100644
|
|
||||||
--- a/net/batman-adv/types.h
|
|
||||||
+++ b/net/batman-adv/types.h
|
|
||||||
@@ -330,7 +330,9 @@ struct batadv_orig_node {
|
|
||||||
DECLARE_BITMAP(bcast_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
|
|
||||||
u32 last_bcast_seqno;
|
|
||||||
struct hlist_head neigh_list;
|
|
||||||
- /* neigh_list_lock protects: neigh_list and router */
|
|
||||||
+ /* neigh_list_lock protects: neigh_list, ifinfo_list,
|
|
||||||
+ * last_bonding_candidate and router
|
|
||||||
+ */
|
|
||||||
spinlock_t neigh_list_lock;
|
|
||||||
struct hlist_node hash_entry;
|
|
||||||
struct batadv_priv *bat_priv;
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Thu, 30 Jun 2016 21:41:13 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Free last_bonding_candidate on release of orig_node
|
|
||||||
|
|
||||||
The orig_ifinfo reference counter for last_bonding_candidate in
|
|
||||||
batadv_orig_node has to be reduced when an originator node is released.
|
|
||||||
Otherwise the orig_ifinfo is leaked and the reference counter the netdevice
|
|
||||||
is not reduced correctly.
|
|
||||||
|
|
||||||
Fixes: 797edd9e87ac ("batman-adv: add bonding again")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
||||||
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/20df5c53865a90095099f0af80536b8abfea303b
|
|
||||||
---
|
|
||||||
net/batman-adv/originator.c | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
|
|
||||||
index fe2fcda..ab8c4f9 100644
|
|
||||||
--- a/net/batman-adv/originator.c
|
|
||||||
+++ b/net/batman-adv/originator.c
|
|
||||||
@@ -766,6 +766,7 @@ static void batadv_orig_node_release(struct kref *ref)
|
|
||||||
struct batadv_orig_node *orig_node;
|
|
||||||
struct batadv_orig_ifinfo *orig_ifinfo;
|
|
||||||
struct batadv_orig_node_vlan *vlan;
|
|
||||||
+ struct batadv_orig_ifinfo *last_candidate;
|
|
||||||
|
|
||||||
orig_node = container_of(ref, struct batadv_orig_node, refcount);
|
|
||||||
|
|
||||||
@@ -783,8 +784,14 @@ static void batadv_orig_node_release(struct kref *ref)
|
|
||||||
hlist_del_rcu(&orig_ifinfo->list);
|
|
||||||
batadv_orig_ifinfo_put(orig_ifinfo);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ last_candidate = orig_node->last_bonding_candidate;
|
|
||||||
+ orig_node->last_bonding_candidate = NULL;
|
|
||||||
spin_unlock_bh(&orig_node->neigh_list_lock);
|
|
||||||
|
|
||||||
+ if (last_candidate)
|
|
||||||
+ batadv_orig_ifinfo_put(last_candidate);
|
|
||||||
+
|
|
||||||
spin_lock_bh(&orig_node->vlan_list_lock);
|
|
||||||
hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {
|
|
||||||
hlist_del_rcu(&vlan->list);
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Sun, 12 Jun 2016 10:43:19 +0200
|
|
||||||
Subject: [PATCH] batman-adv: Fix speedy join in gateway client mode
|
|
||||||
|
|
||||||
Speedy join only works when the received packet is either broadcast or an
|
|
||||||
4addr unicast packet. Thus packets converted from broadcast to unicast via
|
|
||||||
the gateway handling code have to be converted to 4addr packets to allow
|
|
||||||
the receiving gateway server to add the sender address as temporary entry
|
|
||||||
to the translation table.
|
|
||||||
|
|
||||||
Not doing it will make the batman-adv gateway server drop the DHCP response
|
|
||||||
in many situations because it doesn't yet have the TT entry for the
|
|
||||||
destination of the DHCP response.
|
|
||||||
|
|
||||||
Fixes: 9cbc67d9da47 ("batman-adv: change interface_rx to get orig node")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
---
|
|
||||||
net/batman-adv/send.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
|
|
||||||
index f2f1256..0103976 100644
|
|
||||||
--- a/net/batman-adv/send.c
|
|
||||||
+++ b/net/batman-adv/send.c
|
|
||||||
@@ -424,8 +424,8 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
|
|
||||||
struct batadv_orig_node *orig_node;
|
|
||||||
|
|
||||||
orig_node = batadv_gw_get_selected_orig(bat_priv);
|
|
||||||
- return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
|
|
||||||
- orig_node, vid);
|
|
||||||
+ return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
|
|
||||||
+ BATADV_P_DATA, orig_node, vid);
|
|
||||||
}
|
|
||||||
|
|
||||||
void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
|
|
||||||
Loading…
Reference in a new issue