commits March 2016

commits@lists.open-mesh.org

1 participants
51 discussions

[linux-merge]linux integration; annotated tag, v4.5, created. v4.5
by postmaster＠open-mesh.org 14 Mar '16

14 Mar '16

The annotated tag, v4.5 has been created at 0fc80a1fc05dd08762fda6e8efafbb54e88608f4 (tag) tagging b562e44f507e863c6792946e4e1b1449fbbac85d (commit) replaces v4.5-rc7 tagged by Linus Torvalds on Sun Mar 13 21:29:05 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJW5j4RAAoJEHm+PkMAQRiGhVEH/0qZbM1J+WnCK92bm9+inCnB JO2JViGIuCQB5BxljVMil2dzrw85D+dC7+fryr0wVBhhBlr0lXPJGSYCYYTEaI20 Wco5YlTmjRirUwmxWzBXvB5kvTdIaNfNYDcFch6lbsaLUNgqydNKtk08ckO/4k0D AmaShW8swBiXE/RmHuj8H41ksHsnY8W62dlczEaAIfr4kluPX/kKnyXpmpvmZm1j sM4fskPlq+Jz5pOXXFsFfrhiBgpSUnwSj1tNwK5+DkmaVnWOkPuwkqLBWqpy4pzm GTeDBdf5/ixGxgNsZ2VWtbPnc2wEP7SIcu45MU7QFw5kqwDN2nN63BRVXI5Z5qY= =RFx2 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: Allow setting the source mac via unix sock (58e1099)
by postmaster＠open-mesh.org 11 Mar '16

11 Mar '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 58e109973bbe8b6974a8f5d13777d949fd7054d1 Author: Dominik Heidler <dominik(a)heidler.eu> Date: Fri Mar 11 18:02:48 2016 +0100 alfred: Allow setting the source mac via unix sock The server will only overwrite the mac if it is zero. Ths allows acting in place of (non-alfred) legacy clients by injecting their data with the correct source mac. Signed-off-by: Dominik Heidler <dominik(a)heidler.eu> [sw(a)simonwunderlich.de: applied some style changes] Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 58e109973bbe8b6974a8f5d13777d949fd7054d1 unix_sock.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/unix_sock.c b/unix_sock.c index 3c7e583..a0ccc13 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -97,6 +97,7 @@ static int unix_sock_add_data(struct globals *globals, struct alfred_push_data_v0 *push, int client_sock) { + static const char zero[ETH_ALEN] = { 0 }; struct alfred_data *data; struct dataset *dataset; int len, data_len, ret = -1; @@ -119,7 +120,13 @@ static int unix_sock_add_data(struct globals *globals, data = push->data; data_len = ntohs(data->header.length); - memcpy(data->source, &interface->hwaddr, sizeof(interface->hwaddr)); + + /* clients should set the source mac to 00:00:00:00:00:00 + * to make the server set the source for them + */ + if (memcmp(zero, data->source, sizeof(data->source)) == 0) + memcpy(data->source, &interface->hwaddr, + sizeof(interface->hwaddr)); if ((int)(data_len + sizeof(*data)) > len) goto err;

1 0

[alfred] master: alfred: vis: Use debugfs_make_path helper (dca3ebf)
by postmaster＠open-mesh.org 11 Mar '16

11 Mar '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit dca3ebf5e44e421f5b5c9ac29efa61021d9b6bcb Author: Andrew Lunn <andrew(a)lunn.ch> Date: Thu Jan 28 04:53:13 2016 +0100 alfred: vis: Use debugfs_make_path helper By using the helper, knowledge of network namespaces can be kept to within the helper. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- dca3ebf5e44e421f5b5c9ac29efa61021d9b6bcb vis/vis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vis/vis.c b/vis/vis.c index 753cb91..4d494bc 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -325,7 +325,7 @@ static int parse_orig_list(struct globals *globals) char path[1024]; struct vis_list_entry *v_entry; - snprintf(path, sizeof(path), "/sys/kernel/debug/batman_adv/%s/originators", globals->interface); + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" "originators", globals->interface, path, sizeof(path)); fbuf = read_file(path); if (!fbuf) return -1;

1 0

[batmand] master: batmand: update email address for Simon Wunderlich (df6fcb8)
by postmaster＠open-mesh.org 10 Mar '16

10 Mar '16

Repository : ssh://git@open-mesh.org/batmand On branch : master >--------------------------------------------------------------- commit df6fcb8706d325b3fd4c7000493e64d57c852755 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Oct 10 23:59:11 2013 +0200 batmand: update email address for Simon Wunderlich My university will stop email service for alumni in january 2014, please use my new e-mail address instead. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- df6fcb8706d325b3fd4c7000493e64d57c852755 THANKS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THANKS b/THANKS index 9c10878..c102caa 100644 --- a/THANKS +++ b/THANKS @@ -9,7 +9,7 @@ Corinna 'Elektra' Aichele (onelektra-at-gmx.net) Thomas Lopatic (thomas-at-lopatic.de) Felix Fietkau (nbd-at-nbd.name) Ludger Schmudde (lui-at-schmudde.com) -Simon Wunderlich (siwu-at-hrz.tu-chemnitz.de) +Simon Wunderlich (sw-at-simonwunderlich.de) Andreas Langer (an.langer-at-gmx.de) Sven Eckelmann (sven.eckelmann-at-gmx.de) Antoine van Gelder (antoine-at-7degrees.co.za)

1 0

[linux-merge]linux integration; annotated tag, v4.5-rc7, created. v4.5-rc7
by postmaster＠open-mesh.org 06 Mar '16

06 Mar '16

The annotated tag, v4.5-rc7 has been created at 4dbe92d445c77fed92d4bb1b655ea52c61205b78 (tag) tagging f6cede5b49e822ebc41a099fe41ab4989f64e2cb (commit) replaces v4.5-rc6 tagged by Linus Torvalds on Sun Mar 6 14:48:20 2016 -0800 - Shortlog ------------------------------------------------------------ Linux 4.5-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJW3LO0AAoJEHm+PkMAQRiGhewIAIVHA1+qSSXEHTFeuLRuYpiz +ptQUIjPJdakWm/XqOnwSG8SWUuD4XL6ysfNmLSZIdqXYBAPpAuwT1UA2FZhz0dN soZxMNleAvzHWRDFLqwjVdOVlTxS6CTTdEQNzi+3R0ZCADllsRcuj/GBIY+M8cr6 LvxK8BnhDU+Au3gZQjaujTMO7fKG6gOq4wKz/U7RIG37A6rwW577kEfLg4ZgFwt9 RVjsky5mrX9+4l3QFtox9ZC383P/0VZ6+vXwN2QH1/joDK4EvA8pCwsGTyjRJiqi fArHbS+mHyAtbPWJmDbVlQ5dkZJAqRgtWBydjQYoC16S4Bwdce2/FbhBiTgEQAo= =sqln -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, deleted. v4.5-rc5-945-g8b82317
by postmaster＠open-mesh.org 01 Mar '16

01 Mar '16

The annotated tag, batman-adv-for-davem has been deleted was 6b8d97613778c47afc26074fd857db6675e8d6f2 ----------------------------------------------------------------------- tag batman-adv-for-davem With this patchset we finally introduce our new routing protocol: B.A.T.M.A.N. V. Its implementation started quite some years ago, but due to the big changes being introduced it took a while to be discussed, designed, worked, re-worked, tested and debugged (well, we're never done with the latest). The entire operation has basically been a team work involving all the core contributors together with other people interested in the project. The new protocol is divided into two main subcomponents, called respectively ELP and OGMv2. The former is in charge of dealing with the neighbour discovery and link quality estimation, while the latter implements the algorithm that spreads the metrics around the network and computes optimal paths. The biggest change introduced with B.A.T.M.A.N. V is the new metric: the protocol won't rely on packet loss anymore, but it will use the estimated throughput extracted directly from the wifi driver (when available) by querying cfg80211. Batman-adv will also send some unicast probing packets when an interface is not used for payload traffic to make sure that such values are current. The new protocol can be compiled-in or not like other features we have and when selected will pull in CFG80211 as dependency for the reason described above. Thanks to the big work brought up in the past by Marek Lindner, batman-adv can easily deal several protocol implementations, therefore compiling in this new version does not exclude the older. This means that the user is offered the option to choose the protocol when creating the mesh interface (default is the old one to keep backward compatibility). Along with the protocol there are some sysfs knobs that are introduced to fine tune some of its behaviours, but users are recommended to keep the default values unless they know what they are doing. The last patch is about advertising our own patchwork platform (thanks to Sven Eckelmann for having set that up!) in the MAINTAINERS file. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJW1AvOAAoJENpFlCjNi1MRKxsP/1BR8Wh3MrtNhX7MMe7PnZEQ p00kArkjtnZCbBVFbG3JduqYaOPnGyzCLgBgF3DnOxx8gAGUEu6fu4AQNNr9jiUM 4lPnPbe5NuvjzQW27fJDZMuy4Y1FLaJ5DeoYjDH48/YDNS38nzlPPtNwg0pJA2TG C22dM6CX9kzxiy5RETmjgIjK2fgIybudWtCv7BGZxNyiqMaq+bYD+ZJJ6/wbj/FV uKbWB28puJZ3U3qTJ6ygbhAq8moeubp/nbZeh2RGkhpmnS7LKgdLWyPxJLAEza7Z jbdhyAE2xDYaU2xxVdOH9GecSYeUlQ+mrBdEblo2cfKMgShwZBrNjQxCaJIHN3G9 ta44yUpjGFl6/HIQnzfNZD4bTRNnb/DeRTG5qWxdrGAbxZESsMPf1Ph/hZ+KvSZ5 7eSZPmVGRYl8hJaLc25bG8pCOLQRsx/54hXNqYRqmImiPQi4IRvKUQkEDXBpHrT+ EwChfIQvCJSzZQAljrhYP/ytg/CiZxNKgW1u8cJRlHRs3jbBxJUJ67gvf2yWdQdj Luc76uLA1++8QLqhny6AtLeRrr7mYDFnJuNjkwbqWFSyBK6r/lKS1L3ereTfeVIM 5VWMuEDlbWuPscufDJ6WDgWwTqypybjvYbnDlQV7xHap7OegyS/ukQVz2W5lXvS1 gGERfC8WeW1JnFb5TSAY =qd6p -----END PGP SIGNATURE----- 8b823170550e5dcc80512143088c9f9e24598f9a MAINTAINERS: Add patchwork URL for BATMAN ADVANCED ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v4.5-rc1-2556-g07c47db
by postmaster＠open-mesh.org 01 Mar '16

01 Mar '16

The following commit has been merged in the merge/master branch: commit 32bcb3f6e3cf92d9c1d19f0d254c094c119da811 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 22 22:56:33 2016 +0100 batman-adv: Fix unexpected free of bcast_own on add_if error The function batadv_iv_ogm_orig_add_if allocates new buffers for bcast_own and bcast_own_sum. It is expected that these buffers are unchanged in case either bcast_own or bcast_own_sum couldn't be resized. But the error handling of this function frees the already resized buffer for bcast_own when the allocation of the new bcast_own_sum buffer failed. This will lead to an invalid memory access when some code will try to access bcast_own. Instead the resized new bcast_own buffer has to be kept. This will not lead to problems because the size of the buffer was only increased and therefore no user of the buffer will try to access bytes outside of the new buffer. Fixes: fdafa7d29ace ("batman-adv: provide orig_node routing API") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a6d389b..ea553fe 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -155,10 +155,8 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, orig_node->bat_iv.bcast_own = data_ptr; data_ptr = kmalloc_array(max_if_num, sizeof(u8), GFP_ATOMIC); - if (!data_ptr) { - kfree(orig_node->bat_iv.bcast_own); + if (!data_ptr) goto unlock; - } memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, (max_if_num - 1) * sizeof(u8)); -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v4.5-rc1-2556-g07c47db
by postmaster＠open-mesh.org 01 Mar '16

01 Mar '16

The following commit has been merged in the merge/master branch: commit 3515604d82d5b8f80201d8ff0cc4708da8cddb00 Author: Antonio Quartulli <a(a)unstable.cc> Date: Sun Feb 28 10:44:30 2016 +0100 batman-adv: ELP - use new ethtool_link_get_ksettings API The ethtool API is changing in linux-4.6 and the B.A.T.M.A.N. V code has to be changed accordingly. Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Antonio Quartulli <a(a)unstable.cc> [sven(a)narfation.org: Added compat code for __ethtool_get_link_ksettings] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h new file mode 100644 index 0000000..87f7577 --- /dev/null +++ b/compat-include/linux/ethtool.h @@ -0,0 +1,62 @@ +/* Copyright (C) 2016 B.A.T.M.A.N. contributors: + * + * Antonio Quartulli + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ + +#include <linux/version.h> +#include_next <linux/ethtool.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) + +#define ethtool_link_ksettings batadv_ethtool_link_ksettings + +struct batadv_ethtool_link_ksettings { + struct { + __u32 speed; + __u8 duplex; + } base; +}; + +#define __ethtool_get_link_ksettings(__dev, __link_settings) \ + batadv_ethtool_get_link_ksettings(__dev, __link_settings) + +static inline int +batadv_ethtool_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *link_ksettings) +{ + struct ethtool_cmd cmd; + int ret; + + memset(&cmd, 0, sizeof(cmd)); + ret = __ethtool_get_settings(dev, &cmd); + + if (ret != 0) + return ret; + + link_ksettings->base.duplex = cmd.duplex; + link_ksettings->base.speed = ethtool_cmd_speed(&cmd); + + return 0; +} + +#endif /* < KERNEL_VERSION(4, 6, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ */ diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index e94b4a0..3844e7e 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -73,8 +73,8 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) { struct batadv_hard_iface *hard_iface = neigh->if_incoming; + struct ethtool_link_ksettings link_settings; struct station_info sinfo; - struct ethtool_cmd cmd; u32 throughput; int ret; @@ -110,19 +110,19 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) /* if not a wifi interface, check if this device provides data via * ethtool (e.g. an Ethernet adapter) */ - memset(&cmd, 0, sizeof(cmd)); + memset(&link_settings, 0, sizeof(link_settings)); rtnl_lock(); - ret = __ethtool_get_settings(hard_iface->net_dev, &cmd); + ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); if (ret == 0) { /* link characteristics might change over time */ - if (cmd.duplex == DUPLEX_FULL) + if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; else hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX; - throughput = ethtool_cmd_speed(&cmd); - if (throughput && throughput != SPEED_UNKNOWN) + throughput = link_settings.base.speed; + if (throughput && (throughput != SPEED_UNKNOWN)) return throughput * 10; } -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v4.5-rc1-2556-g07c47db
by postmaster＠open-mesh.org 01 Mar '16

01 Mar '16

The following commit has been merged in the merge/master branch: commit 4030943108e5f6af6f97ac64ab4e1b38d14b04de Merge: 7028cda17de6fd524c7cf99c50eab15fa07e8ed8 789b846af6a9471982b181687a1cba8dc996b269 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Feb 28 12:45:31 2016 +0800 Merge branch 'maint' into next diff --combined net/batman-adv/bat_iv_ogm.c index af8bd86,da0ad2b..dadd52a --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -1,4 -1,4 +1,4 @@@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@@ -31,7 -31,6 +31,7 @@@ #include <linux/init.h> #include <linux/jiffies.h> #include <linux/list.h> +#include <linux/kref.h> #include <linux/netdevice.h> #include <linux/pkt_sched.h> #include <linux/printk.h> @@@ -285,8 -284,8 +285,8 @@@ batadv_iv_ogm_orig_get(struct batadv_pr free_orig_node: /* free twice, as batadv_orig_node_new sets refcount to 2 */ - batadv_orig_node_free_ref(orig_node); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); + batadv_orig_node_put(orig_node); return NULL; } @@@ -395,14 -394,7 +395,14 @@@ static u8 batadv_hop_penalty(u8 tq, con return new_tq; } -/* is there another aggregated packet here? */ +/** + * batadv_iv_ogm_aggr_packet - checks if there is another OGM attached + * @buff_pos: current position in the skb + * @packet_len: total length of the skb + * @tvlv_len: tvlv length of the previously considered OGM + * + * Return: true if there is enough space for another OGM, false otherwise. + */ static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, __be16 tvlv_len) { @@@ -476,7 -468,7 +476,7 @@@ static void batadv_iv_ogm_send_to_if(st batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX); batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES, skb->len + ETH_HLEN); - batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); + batadv_send_broadcast_skb(skb, hard_iface); } } @@@ -513,7 -505,7 +513,7 @@@ static void batadv_iv_ogm_emit(struct b out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); } /** @@@ -615,7 -607,7 +615,7 @@@ batadv_iv_ogm_can_aggregate(const struc out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); return res; } @@@ -642,10 -634,10 +642,10 @@@ static void batadv_iv_ogm_aggregate_new unsigned char *skb_buff; unsigned int skb_size; - if (!atomic_inc_not_zero(&if_incoming->refcount)) + if (!kref_get_unless_zero(&if_incoming->refcount)) return; - if (!atomic_inc_not_zero(&if_outgoing->refcount)) + if (!kref_get_unless_zero(&if_outgoing->refcount)) goto out_free_incoming; /* own packet should always be scheduled */ @@@ -709,9 -701,9 +709,9 @@@ out_nomem if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); out_free_outgoing: - batadv_hardif_free_ref(if_outgoing); + batadv_hardif_put(if_outgoing); out_free_incoming: - batadv_hardif_free_ref(if_incoming); + batadv_hardif_put(if_incoming); } /* aggregate a new packet into the existing ogm packet */ @@@ -956,7 -948,7 +956,7 @@@ static void batadv_iv_ogm_schedule(stru out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); } /** @@@ -1001,9 -993,9 +1001,9 @@@ batadv_iv_ogm_orig_update(struct batadv neigh_addr = tmp_neigh_node->addr; if (batadv_compare_eth(neigh_addr, ethhdr->h_source) && tmp_neigh_node->if_incoming == if_incoming && - atomic_inc_not_zero(&tmp_neigh_node->refcount)) { + kref_get_unless_zero(&tmp_neigh_node->refcount)) { if (WARN(neigh_node, "too many matching neigh_nodes")) - batadv_neigh_node_free_ref(neigh_node); + batadv_neigh_node_put(neigh_node); neigh_node = tmp_neigh_node; continue; } @@@ -1024,7 -1016,7 +1024,7 @@@ neigh_ifinfo->bat_iv.tq_avg = tq_avg; spin_unlock_bh(&tmp_neigh_node->ifinfo_lock); - batadv_neigh_ifinfo_free_ref(neigh_ifinfo); + batadv_neigh_ifinfo_put(neigh_ifinfo); neigh_ifinfo = NULL; } @@@ -1039,7 -1031,7 +1039,7 @@@ ethhdr->h_source, orig_node, orig_tmp); - batadv_orig_node_free_ref(orig_tmp); + batadv_orig_node_put(orig_tmp); if (!neigh_node) goto unlock; } else { @@@ -1114,13 -1106,13 +1114,13 @@@ unlock rcu_read_unlock(); out: if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); + batadv_neigh_node_put(neigh_node); if (router) - batadv_neigh_node_free_ref(router); + batadv_neigh_node_put(router); if (neigh_ifinfo) - batadv_neigh_ifinfo_free_ref(neigh_ifinfo); + batadv_neigh_ifinfo_put(neigh_ifinfo); if (router_ifinfo) - batadv_neigh_ifinfo_free_ref(router_ifinfo); + batadv_neigh_ifinfo_put(router_ifinfo); } /** @@@ -1145,9 -1137,10 +1145,10 @@@ static int batadv_iv_ogm_calc_tq(struc u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int tq_asym_penalty, inv_asym_penalty, if_num, ret = 0; + int if_num, ret = 0; + unsigned int tq_asym_penalty, inv_asym_penalty; unsigned int combined_tq; - int tq_iface_penalty; + unsigned int tq_iface_penalty; /* find corresponding one hop neighbor */ rcu_read_lock(); @@@ -1160,7 -1153,7 +1161,7 @@@ if (tmp_neigh_node->if_incoming != if_incoming) continue; - if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + if (!kref_get_unless_zero(&tmp_neigh_node->refcount)) continue; neigh_node = tmp_neigh_node; @@@ -1190,7 -1183,7 +1191,7 @@@ neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing); if (neigh_ifinfo) { neigh_rq_count = neigh_ifinfo->bat_iv.real_packet_count; - batadv_neigh_ifinfo_free_ref(neigh_ifinfo); + batadv_neigh_ifinfo_put(neigh_ifinfo); } else { neigh_rq_count = 0; } @@@ -1263,7 -1256,7 +1264,7 @@@ out: if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); + batadv_neigh_node_put(neigh_node); return ret; } @@@ -1304,7 -1297,7 +1305,7 @@@ batadv_iv_ogm_update_seqnos(const struc orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); if (WARN_ON(!orig_ifinfo)) { - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return 0; } @@@ -1314,8 -1307,7 +1315,8 @@@ /* signalize caller that the packet is to be dropped. */ if (!hlist_empty(&orig_node->neigh_list) && batadv_window_protected(bat_priv, seq_diff, - &orig_ifinfo->batman_seqno_reset)) { + BATADV_TQ_LOCAL_WINDOW_SIZE, + &orig_ifinfo->batman_seqno_reset, NULL)) { ret = BATADV_PROTECTED; goto out; } @@@ -1351,7 -1343,7 +1352,7 @@@ packet_count = bitmap_weight(bitmap, BATADV_TQ_LOCAL_WINDOW_SIZE); neigh_ifinfo->bat_iv.real_packet_count = packet_count; - batadv_neigh_ifinfo_free_ref(neigh_ifinfo); + batadv_neigh_ifinfo_put(neigh_ifinfo); } rcu_read_unlock(); @@@ -1365,8 -1357,8 +1366,8 @@@ out: spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); - batadv_orig_node_free_ref(orig_node); - batadv_orig_ifinfo_free_ref(orig_ifinfo); + batadv_orig_node_put(orig_node); + batadv_orig_ifinfo_put(orig_ifinfo); return ret; } @@@ -1512,7 -1504,7 +1513,7 @@@ batadv_iv_ogm_process_per_outif(const s ogm_packet, if_incoming, if_outgoing, dup_status); } - batadv_orig_ifinfo_free_ref(orig_ifinfo); + batadv_orig_ifinfo_put(orig_ifinfo); /* only forward for specific interface, not for the default one. */ if (if_outgoing == BATADV_IF_DEFAULT) @@@ -1561,18 -1553,18 +1562,18 @@@ out_neigh: if ((orig_neigh_node) && (!is_single_hop_neigh)) - batadv_orig_node_free_ref(orig_neigh_node); + batadv_orig_node_put(orig_neigh_node); out: if (router_ifinfo) - batadv_neigh_ifinfo_free_ref(router_ifinfo); + batadv_neigh_ifinfo_put(router_ifinfo); if (router) - batadv_neigh_node_free_ref(router); + batadv_neigh_node_put(router); if (router_router) - batadv_neigh_node_free_ref(router_router); + batadv_neigh_node_put(router_router); if (orig_neigh_router) - batadv_neigh_node_free_ref(orig_neigh_router); + batadv_neigh_node_put(orig_neigh_router); if (hardif_neigh) - batadv_hardif_neigh_free_ref(hardif_neigh); + batadv_hardif_neigh_put(hardif_neigh); kfree_skb(skb_priv); } @@@ -1695,7 -1687,7 +1696,7 @@@ static void batadv_iv_ogm_process(cons batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Drop packet: originator packet from myself (via neighbor)\n"); - batadv_orig_node_free_ref(orig_neigh_node); + batadv_orig_node_put(orig_neigh_node); return; } @@@ -1733,7 -1725,7 +1734,7 @@@ } rcu_read_unlock(); - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } static int batadv_iv_ogm_receive(struct sk_buff *skb, @@@ -1803,7 -1795,7 +1804,7 @@@ batadv_iv_ogm_orig_print_neigh(struct b neigh_node->addr, n_ifinfo->bat_iv.tq_avg); - batadv_neigh_ifinfo_free_ref(n_ifinfo); + batadv_neigh_ifinfo_put(n_ifinfo); } } @@@ -1866,9 -1858,9 +1867,9 @@@ static void batadv_iv_ogm_orig_print(st batman_count++; next: - batadv_neigh_node_free_ref(neigh_node); + batadv_neigh_node_put(neigh_node); if (n_ifinfo) - batadv_neigh_ifinfo_free_ref(n_ifinfo); + batadv_neigh_ifinfo_put(n_ifinfo); } rcu_read_unlock(); } @@@ -1962,9 -1954,9 +1963,9 @@@ static int batadv_iv_ogm_neigh_cmp(stru out: if (neigh1_ifinfo) - batadv_neigh_ifinfo_free_ref(neigh1_ifinfo); + batadv_neigh_ifinfo_put(neigh1_ifinfo); if (neigh2_ifinfo) - batadv_neigh_ifinfo_free_ref(neigh2_ifinfo); + batadv_neigh_ifinfo_put(neigh2_ifinfo); return diff; } @@@ -2005,9 -1997,9 +2006,9 @@@ batadv_iv_ogm_neigh_is_sob(struct batad out: if (neigh1_ifinfo) - batadv_neigh_ifinfo_free_ref(neigh1_ifinfo); + batadv_neigh_ifinfo_put(neigh1_ifinfo); if (neigh2_ifinfo) - batadv_neigh_ifinfo_free_ref(neigh2_ifinfo); + batadv_neigh_ifinfo_put(neigh2_ifinfo); return ret; } -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v4.5-rc1-2556-g07c47db
by postmaster＠open-mesh.org 01 Mar '16

01 Mar '16

The following commit has been merged in the merge/master branch: commit 789b846af6a9471982b181687a1cba8dc996b269 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Tue Feb 16 10:47:07 2016 +0100 batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq The undefined behavior sanatizer detected an signed integer overflow in a setup with near perfect link quality UBSAN: Undefined behaviour in net/batman-adv/bat_iv_ogm.c:1246:25 signed integer overflow: 8713350 * 255 cannot be represented in type 'int' The problems happens because the calculation of mixed unsigned and signed integers resulted in an integer multiplication. batadv_ogm_packet::tq (u8 255) * tq_own (u8 255) * tq_asym_penalty (int 134; max 255) * tq_iface_penalty (int 255; max 255) The tq_iface_penalty, tq_asym_penalty and inv_asym_penalty can just be changed to unsigned int because they are not expected to become negative. Fixes: 46e44fdb96ef ("batman-adv: add WiFi penalty") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index ea553fe..da0ad2b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1137,9 +1137,10 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int tq_asym_penalty, inv_asym_penalty, if_num, ret = 0; + int if_num, ret = 0; + unsigned int tq_asym_penalty, inv_asym_penalty; unsigned int combined_tq; - int tq_iface_penalty; + unsigned int tq_iface_penalty; /* find corresponding one hop neighbor */ rcu_read_lock(); -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2016