commits July 2016

commits@lists.open-mesh.org

1 participants
109 discussions

[batman-adv] maint: batman-adv: Avoid tt_req_node list put for unhashed entry (03ecc9f)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 03ecc9f957b837c755f09251c5f684996521e487 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jun 24 21:43:32 2016 +0200 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(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 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 0

[batman-adv] maint: batman-adv: Avoid nullptr dereference in dat after vlan_insert_tag (898382d)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 898382d11fa1f737cd4f7033db1088c601fd11ed Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 2 09:52:14 2016 +0200 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(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 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 0

[batman-adv] maint: batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag (e4cffba)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit e4cffba4d3353ea15287abbfbdd65208aa62c156 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 2 09:52:13 2016 +0200 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(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 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);

1 0

[batman-adv] master: Merge branch 'next' (033b779)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 033b7794f871d35ee3feab32b093aeed4393c582 Merge: 633703f 1718050 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Jul 5 16:44:03 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 033b7794f871d35ee3feab32b093aeed4393c582 include/uapi/linux/batman_adv.h | 20 ++++++++++---------- net/batman-adv/Kconfig | 2 +- net/batman-adv/routing.c | 10 ++++------ net/batman-adv/send.c | 17 +++++++++++++---- net/batman-adv/tp_meter.c | 3 +++ net/batman-adv/tvlv.c | 2 +- 6 files changed, 32 insertions(+), 22 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (033b779)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: c94437f batman-adv: Switch netlink uapi header copyright to ISC e917bb4 batman-adv: Fix Kconfig dependencies regarding multicast optimizations ae49875 batman-adv: Free tp_meter ack skb when it was not consumed a20149c batman-adv: Don't propagate negative dev_queue_xmit return values ec76a65 batman-adv: remove NET_XMIT_POLICED 1718050 batman-adv: Remove unnecessary call to dev_xmit_complete 033b779 Merge branch 'next'

1 0

[batman-adv] next: batman-adv: Remove unnecessary call to dev_xmit_complete (1718050)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 1718050ebe28970582e939a6a016f1a65de7b2bf Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jun 20 19:54:49 2016 +0200 batman-adv: Remove unnecessary call to dev_xmit_complete The dev_xmit_complete function is only necessary to check the return value for *_hard_xmit functions. But batman-adv only uses dev_queue_xmit to send data via the interface queue. >From the kerneldoc of __dev_queue_xmit: Regardless of the return value, the skb is consumed, so it is currently difficult to retry a send to this method. (You can bump the ref count before sending to hold a reference for retry if you are careful.) Fixes: e3b8acbff9c8 ("batman-adv: return netdev status in the TX path") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 1718050ebe28970582e939a6a016f1a65de7b2bf net/batman-adv/routing.c | 10 ++++------ net/batman-adv/send.c | 2 +- net/batman-adv/tvlv.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 2bc9645..af8e119 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -274,8 +274,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, if (res == -1) goto out; - if (dev_xmit_complete(res)) - ret = NET_RX_SUCCESS; + ret = NET_RX_SUCCESS; break; case BATADV_TP: @@ -335,7 +334,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet->ttl = BATADV_TTL; res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (res != -1 && dev_xmit_complete(res)) + if (res != -1) ret = NET_RX_SUCCESS; out: @@ -423,7 +422,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, /* route it */ res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res != -1 && dev_xmit_complete(res)) + if (res != -1) ret = NET_RX_SUCCESS; out: @@ -671,8 +670,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len + ETH_HLEN); } - if (dev_xmit_complete(res)) - ret = NET_RX_SUCCESS; + ret = NET_RX_SUCCESS; out: if (orig_node) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 80208f1..3a10d87 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -366,7 +366,7 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, unicast_packet->ttvn = unicast_packet->ttvn - 1; res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (res != -1 && dev_xmit_complete(res)) + if (res != -1) ret = NET_XMIT_SUCCESS; out: diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index 8c59420..3d1cf0f 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -625,7 +625,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src, memcpy(tvlv_buff, tvlv_value, tvlv_value_len); res = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (!(res != -1 && dev_xmit_complete(res))) + if (res == -1) kfree_skb(skb); out: batadv_orig_node_put(orig_node);

1 0

[batman-adv] next: batman-adv: remove NET_XMIT_POLICED (ec76a65)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit ec76a658ce730b712a658f6e2284bf52d4f3327d Author: Florian Westphal <fw(a)strlen.de> Date: Mon Jun 20 19:54:48 2016 +0200 batman-adv: remove NET_XMIT_POLICED BATMAN uses it as an intermediate return value to signal forwarding vs. buffering, but it did not return POLICED to callers outside of BATMAN. Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: rebased on top of TX path rewrite] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ec76a658ce730b712a658f6e2284bf52d4f3327d net/batman-adv/send.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 70a8c1d..80208f1 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -20,6 +20,7 @@ #include <linux/atomic.h> #include <linux/byteorder/generic.h> +#include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if.h> @@ -164,7 +165,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb, * host, NULL can be passed as recv_if and no interface alternating is * attempted. * - * Return: -1 on failure (and the skb is not consumed), NET_XMIT_POLICED if the + * Return: -1 on failure (and the skb is not consumed), -EINPROGRESS if the * skb is buffered for later transmit or the NET_XMIT status returned by the * lower routine if the packet has been passed down. * @@ -199,7 +200,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb, * network coding fails, then send the packet as usual. */ if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) - ret = NET_XMIT_POLICED; + ret = -EINPROGRESS; else ret = batadv_send_unicast_skb(skb, neigh_node);

1 0

[batman-adv] next: batman-adv: Don't propagate negative dev_queue_xmit return values (a20149c)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit a20149c7dcaeb10251bdcd1571277778ad9b4829 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jun 20 19:53:28 2016 +0200 batman-adv: Don't propagate negative dev_queue_xmit return values batadv_send_skb_packet used by batadv_send_skb_to_orig and its return value is given directly to callers of batadv_send_skb_packet. batadv_send_skb_to_orig -> batadv_send_unicast_skb -> batadv_send_skb_packet -> dev_queue_xmit These callers of batadv_send_skb_to_orig expect that the skb isn't consumed when they receive a -1. But dev_queue_xmit may still have consumed it and still returned -1. Thus the free for the skb would be called twice. Fixes: e3b8acbff9c8 ("batman-adv: return netdev status in the TX path") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- a20149c7dcaeb10251bdcd1571277778ad9b4829 net/batman-adv/send.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 49836da..70a8c1d 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -72,6 +72,7 @@ int batadv_send_skb_packet(struct sk_buff *skb, { struct batadv_priv *bat_priv; struct ethhdr *ethhdr; + int ret; bat_priv = netdev_priv(hard_iface->soft_iface); @@ -109,8 +110,15 @@ int batadv_send_skb_packet(struct sk_buff *skb, /* dev_queue_xmit() returns a negative result on error. However on * congestion and traffic shaping, it drops and returns NET_XMIT_DROP * (which is > 0). This will not be treated as an error. + * + * a negative value cannot be returned because it could be interepreted + * as not consumed skb by callers of batadv_send_skb_to_orig. */ - return dev_queue_xmit(skb); + ret = dev_queue_xmit(skb); + if (ret < 0) + ret = NET_XMIT_DROP; + + return ret; send_skb_err: kfree_skb(skb); return NET_XMIT_DROP;

1 0

[batman-adv] next: batman-adv: Free tp_meter ack skb when it was not consumed (ae49875)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit ae4987543086a574851c4f5542856ece6d2dc9a5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jun 20 19:53:27 2016 +0200 batman-adv: Free tp_meter ack skb when it was not consumed batadv_send_skb_to_orig can return -1 to signal that the skb was not consumed. tp_meter has then to free the skb to avoid a memory leak. Fixes: 98d7a766b645 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ae4987543086a574851c4f5542856ece6d2dc9a5 net/batman-adv/tp_meter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index bf6bffb..2333777 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -1206,6 +1206,9 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst, /* send the ack */ r = batadv_send_skb_to_orig(skb, orig_node, NULL); + if (r == -1) + kfree_skb(skb); + if (unlikely(r < 0) || (r == NET_XMIT_DROP)) { ret = BATADV_TP_REASON_DST_UNREACHABLE; goto out;

1 0

[batman-adv] next: batman-adv: Fix Kconfig dependencies regarding multicast optimizations (e917bb4)
by postmaster＠open-mesh.org 05 Jul '16

05 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit e917bb46159e3005e47d2d6bcd9a288ffe264160 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Jun 30 10:09:25 2016 +0200 batman-adv: Fix Kconfig dependencies regarding multicast optimizations Since recently the multicast optimizations are using functions from the bridge module. If batman-adv is a kernel built-in, then these bridge functions need to be accessible immediately. Thus adding a Kconfig dependency for the multicast optimizations to depend on batman-adv being built as a module if the bridge is built as a module, too. This fixes build errors like the following: ~~~ net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b7eb): undefined reference to `br_multicast_has_querier_anywhere' net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b7fa): undefined reference to `br_multicast_has_querier_adjacent' net/built-in.o: In function `batadv_mcast_mla_update': (.text+0x19b809): undefined reference to `br_multicast_has_querier_anywhere' net/built-in.o: In function `batadv_mcast_mla_update': (.text+0x19b818): undefined reference to `br_multicast_has_querier_adjacent' net/built-in.o: In function `batadv_mcast_mla_update': >> (.text+0x19b8cf): undefined reference to `br_multicast_list_adjacent' ~~~ Fixes: 391b59cdb111 ("batman-adv: Add multicast optimization support for bridged setups") Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e917bb46159e3005e47d2d6bcd9a288ffe264160 net/batman-adv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index b7ba97d..833bb14 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -66,7 +66,7 @@ config BATMAN_ADV_NC config BATMAN_ADV_MCAST bool "Multicast optimisation" - depends on BATMAN_ADV && INET + depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y) default n help This option enables the multicast optimisation which aims to

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2016