linux-merge April 2016

linux-merge@lists.open-mesh.org

3 participants
61 discussions

Build check errors found: 2016-04-30
by postmaster＠open-mesh.org 30 Apr '16

30 Apr '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 178 +++++------- net/batman-adv/bat_v.c | 21 - net/batman-adv/bat_v_ogm.c | 219 +++++++-------- net/batman-adv/bitarray.c | 16 - net/batman-adv/bitarray.h | 15 - net/batman-adv/bridge_loop_avoidance.c | 333 ++++++------------------ net/batman-adv/bridge_loop_avoidance.h | 43 +-- net/batman-adv/debugfs.c | 21 - net/batman-adv/distributed-arp-table.c | 31 +- net/batman-adv/fragmentation.c | 12 net/batman-adv/gateway_client.c | 12 net/batman-adv/hard-interface.c | 40 +- net/batman-adv/hard-interface.h | 3 net/batman-adv/hash.h | 6 net/batman-adv/icmp_socket.c | 24 + net/batman-adv/main.c | 26 - net/batman-adv/main.h | 11 net/batman-adv/multicast.c | 11 net/batman-adv/network-coding.c | 47 +-- net/batman-adv/originator.c | 60 ++-- net/batman-adv/originator.h | 2 net/batman-adv/packet.h | 3 net/batman-adv/routing.c | 57 +--- net/batman-adv/routing.h | 6 net/batman-adv/send.c | 16 - net/batman-adv/soft-interface.c | 58 +--- net/batman-adv/soft-interface.h | 10 net/batman-adv/sysfs.c | 9 net/batman-adv/translation-table.c | 88 ++++-- net/batman-adv/types.h | 15 - 30 files changed, 589 insertions(+), 804 deletions(-)

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160429
by batman＠open-mesh.org 29 Apr '16

29 Apr '16

The following commit has been merged in the master branch: commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Mar 11 14:04:49 2016 +0100 batman-adv: Fix broadcast/ogm queue limit on a removed interface When removing a single interface while a broadcast or ogm packet is still pending then we will free the forward packet without releasing the queue slots again. This patch is supposed to fix this issue. Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 3ce06e0..7641785 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -675,6 +675,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + batadv_forw_packet_free(forw_packet); } } @@ -702,6 +705,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + batadv_forw_packet_free(forw_packet); } } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160429
by batman＠open-mesh.org 29 Apr '16

29 Apr '16

The following commit has been merged in the master branch: commit c78296665c3d81f040117432ab9e1cb125521b0c Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 26 17:56:13 2016 +0100 batman-adv: Check skb size before using encapsulated ETH+VLAN header The encapsulated ethernet and VLAN header may be outside the received ethernet frame. Thus the skb buffer size has to be checked before it can be parsed to find out if it encapsulates another batman-adv packet. Fixes: 420193573f11 ("batman-adv: softif bridge loop avoidance") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0710379..8a136b6 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -408,11 +408,17 @@ void batadv_interface_rx(struct net_device *soft_iface, */ nf_reset(skb); + if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) + goto dropped; + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: + if (!pskb_may_pull(skb, VLAN_ETH_HLEN)) + goto dropped; + vhdr = (struct vlan_ethhdr *)skb->data; if (vhdr->h_vlan_encapsulated_proto != ethertype) @@ -424,8 +430,6 @@ void batadv_interface_rx(struct net_device *soft_iface, } /* skb->dev & skb->pkt_type are set here */ - if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) - goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); /* should not be necessary anymore as we use skb_pull_rcsum() -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160429
by batman＠open-mesh.org 29 Apr '16

29 Apr '16

The following commit has been merged in the master branch: commit e48474ed8a217b7f80f2a42bc05352406a06cb67 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Mar 11 16:01:09 2016 +0100 batman-adv: init neigh node last seen field Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index e4cbb07..d52f67a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -663,6 +663,7 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node, ether_addr_copy(neigh_node->addr, neigh_addr); neigh_node->if_incoming = hard_iface; neigh_node->orig_node = orig_node; + neigh_node->last_seen = jiffies; /* extra reference for return */ kref_init(&neigh_node->refcount); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160429
by batman＠open-mesh.org 29 Apr '16

29 Apr '16

The following commit has been merged in the master branch: commit f2d23861b818d08bcd15cc1612ae94aa33b3931c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 19 13:55:21 2016 +0100 batman-adv: Deactivate TO_BE_ACTIVATED hardif on shutdown The shutdown of an batman-adv interface can happen with one of its slave interfaces still being in the BATADV_IF_TO_BE_ACTIVATED state. A possible reason for it is that the routing algorithm BATMAN_V was selected and batadv_schedule_bat_ogm was not yet called for this interface. This slave interface still has to be set to BATADV_IF_INACTIVE or the batman-adv interface will never reduce its usage counter and thus never gets shutdown. This problem can be simulated via: $ modprobe dummy $ modprobe batman-adv routing_algo=BATMAN_V $ ip link add bat0 type batadv $ ip link set dummy0 master bat0 $ ip link set dummy0 up $ ip link del bat0 unregister_netdevice: waiting for bat0 to become free. Usage count = 3 Reported-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index b22b277..c61d5b0 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -572,8 +572,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hard_iface *primary_if = NULL; - if (hard_iface->if_status == BATADV_IF_ACTIVE) - batadv_hardif_deactivate_interface(hard_iface); + batadv_hardif_deactivate_interface(hard_iface); if (hard_iface->if_status != BATADV_IF_INACTIVE) goto out; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160429
by batman＠open-mesh.org 29 Apr '16

29 Apr '16

The following commit has been merged in the master branch: commit d1a65f1741bfd9c69f9e4e2ad447a89b6810427d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 20 12:27:53 2016 +0100 batman-adv: Reduce refcnt of removed router when updating route _batadv_update_route rcu_derefences orig_ifinfo->router outside of a spinlock protected region to print some information messages to the debug log. But this pointer is not checked again when the new pointer is assigned in the spinlock protected region. Thus is can happen that the value of orig_ifinfo->router changed in the meantime and thus the reference counter of the wrong router gets reduced after the spinlock protected region. Just rcu_dereferencing the value of orig_ifinfo->router inside the spinlock protected region (which also set the new pointer) is enough to get the correct old router object. Fixes: e1a5382f978b ("batman-adv: Make orig_node->router an rcu protected pointer") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 4dd646a..b781bf7 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -105,6 +105,15 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, neigh_node = NULL; spin_lock_bh(&orig_node->neigh_list_lock); + /* curr_router used earlier may not be the current orig_ifinfo->router + * anymore because it was dereferenced outside of the neigh_list_lock + * protected region. After the new best neighbor has replace the current + * best neighbor the reference counter needs to decrease. Consequently, + * the code needs to ensure the curr_router variable contains a pointer + * to the replaced best neighbor. + */ + curr_router = rcu_dereference_protected(orig_ifinfo->router, true); + rcu_assign_pointer(orig_ifinfo->router, neigh_node); spin_unlock_bh(&orig_node->neigh_list_lock); batadv_orig_ifinfo_put(orig_ifinfo); -- LinuxNextTracking

1 0

Build check errors found: 2016-04-29
by postmaster＠open-mesh.org 28 Apr '16

28 Apr '16

1 0

Build check errors found: 2016-04-28
by postmaster＠open-mesh.org 28 Apr '16

28 Apr '16

1 0

Build check errors found: 2016-04-27
by postmaster＠open-mesh.org 26 Apr '16

26 Apr '16

1 0

Build check errors found: 2016-04-26
by postmaster＠open-mesh.org 26 Apr '16

26 Apr '16

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge April 2016