linux-merge July 2018

linux-merge@lists.open-mesh.org

3 participants
47 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20180719
by batman＠open-mesh.org 19 Jul '18

19 Jul '18

The following commit has been merged in the master branch: commit 6da7be7d24b2921f8215473ba7552796dff05fe1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jun 1 19:24:24 2018 +0200 batman-adv: Fix debugfs path for renamed softif batman-adv is creating special debugfs directories in the init net_namespace for each created soft-interface (batadv net_device). But it is possible to rename a net_device to a completely different name then the original one. It can therefore happen that a user registers a new batadv net_device with the name "bat0". batman-adv is then also adding a new directory under $debugfs/batman-adv/ with the name "wlan0". The user then decides to rename this device to "bat1" and registers a different batadv device with the name "bat0". batman-adv will then try to create a directory with the name "bat0" under $debugfs/batman-adv/ again. But there already exists one with this name under this path and thus this fails. batman-adv will detect a problem and rollback the registering of this device. batman-adv must therefore take care of renaming the debugfs directories for soft-interfaces whenever it detects such a net_device rename. Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 7e5de7b9f6d5..87479c60670e 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -434,6 +434,26 @@ out: } /** + * batadv_debugfs_rename_meshif() - Fix debugfs path for renamed softif + * @dev: net_device which was renamed + */ +void batadv_debugfs_rename_meshif(struct net_device *dev) +{ + struct batadv_priv *bat_priv = netdev_priv(dev); + const char *name = dev->name; + struct dentry *dir; + struct dentry *d; + + dir = bat_priv->debug_dir; + if (!dir) + return; + + d = debugfs_rename(dir->d_parent, dir, dir->d_parent, name); + if (!d) + pr_err("Can't rename debugfs dir to %s\n", name); +} + +/** * batadv_debugfs_del_meshif() - Remove interface dependent debugfs entries * @dev: netdev struct of the soft interface */ diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 8538a7a75e93..08a592ffbee5 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -30,6 +30,7 @@ struct net_device; void batadv_debugfs_init(void); void batadv_debugfs_destroy(void); int batadv_debugfs_add_meshif(struct net_device *dev); +void batadv_debugfs_rename_meshif(struct net_device *dev); void batadv_debugfs_del_meshif(struct net_device *dev); int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface); void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface); @@ -50,6 +51,10 @@ static inline int batadv_debugfs_add_meshif(struct net_device *dev) return 0; } +static inline void batadv_debugfs_rename_meshif(struct net_device *dev) +{ +} + static inline void batadv_debugfs_del_meshif(struct net_device *dev) { } diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index dc2763b11107..2f0d42f2f913 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -989,6 +989,32 @@ void batadv_hardif_remove_interfaces(void) rtnl_unlock(); } +/** + * batadv_hard_if_event_softif() - Handle events for soft interfaces + * @event: NETDEV_* event to handle + * @net_dev: net_device which generated an event + * + * Return: NOTIFY_* result + */ +static int batadv_hard_if_event_softif(unsigned long event, + struct net_device *net_dev) +{ + struct batadv_priv *bat_priv; + + switch (event) { + case NETDEV_REGISTER: + batadv_sysfs_add_meshif(net_dev); + bat_priv = netdev_priv(net_dev); + batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS); + break; + case NETDEV_CHANGENAME: + batadv_debugfs_rename_meshif(net_dev); + break; + } + + return NOTIFY_DONE; +} + static int batadv_hard_if_event(struct notifier_block *this, unsigned long event, void *ptr) { @@ -997,12 +1023,8 @@ static int batadv_hard_if_event(struct notifier_block *this, struct batadv_hard_iface *primary_if = NULL; struct batadv_priv *bat_priv; - if (batadv_softif_is_valid(net_dev) && event == NETDEV_REGISTER) { - batadv_sysfs_add_meshif(net_dev); - bat_priv = netdev_priv(net_dev); - batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS); - return NOTIFY_DONE; - } + if (batadv_softif_is_valid(net_dev)) + return batadv_hard_if_event_softif(event, net_dev); hard_iface = batadv_hardif_get_by_netdev(net_dev); if (!hard_iface && (event == NETDEV_REGISTER || -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180719
by batman＠open-mesh.org 19 Jul '18

19 Jul '18

The following commit has been merged in the master branch: commit 4a519b83da16927fb98fd32b0f598e639d1f1859 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Jun 7 00:46:23 2018 +0200 batman-adv: Avoid storing non-TT-sync flags on singular entries too Since commit 54e22f265e87 ("batman-adv: fix TT sync flag inconsistencies") TT sync flags and TT non-sync'd flags are supposed to be stored separately. The previous patch missed to apply this separation on a TT entry with only a single TT orig entry. This is a minor fix because with only a single TT orig entry the DDoS issue the former patch solves does not apply. Fixes: 54e22f265e87 ("batman-adv: fix TT sync flag inconsistencies") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 3986551397ca..61ce300091f3 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1705,7 +1705,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, ether_addr_copy(common->addr, tt_addr); common->vid = vid; - common->flags = flags; + common->flags = flags & (~BATADV_TT_SYNC_MASK); + tt_global_entry->roam_at = 0; /* node must store current time in case of roaming. This is * needed to purge this entry out on timeout (if nobody claims -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180719
by batman＠open-mesh.org 19 Jul '18

19 Jul '18

The following commit has been merged in the master branch: commit b5685d2687d6612adf5eac519eb7008f74dfd1ec Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jun 2 17:26:34 2018 +0200 batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump A reference for the best gateway is taken when the list of gateways in the mesh is sent via netlink. This is necessary to check whether the currently dumped entry is the currently selected gateway or not. This information is then transferred as flag BATADV_ATTR_FLAG_BEST. After the comparison of the current entry is done, batadv_iv_gw_dump_entry() has to decrease the reference counter again. Otherwise the reference will be held and thus prevents a proper shutdown of the batman-adv interfaces (and some of the interfaces enslaved in it). Fixes: efb766af06e3 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations") Reported-by: Andreas Ziegler <dev(a)andreas-ziegler.de> Tested-by: Andreas Ziegler <dev(a)andreas-ziegler.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index be09a9883825..73bf6a93a3cf 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2732,7 +2732,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, { struct batadv_neigh_ifinfo *router_ifinfo = NULL; struct batadv_neigh_node *router; - struct batadv_gw_node *curr_gw; + struct batadv_gw_node *curr_gw = NULL; int ret = 0; void *hdr; @@ -2780,6 +2780,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, ret = 0; out: + if (curr_gw) + batadv_gw_node_put(curr_gw); if (router_ifinfo) batadv_neigh_ifinfo_put(router_ifinfo); if (router) -- LinuxNextTracking

1 0

Build check errors found: 2018-07-19
by postmaster＠open-mesh.org 19 Jul '18

19 Jul '18

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 4 -- netnext/net/batman-adv/bat_v.c | 4 -- netnext/net/batman-adv/debugfs.c | 40 -------------------- netnext/net/batman-adv/debugfs.h | 11 ----- netnext/net/batman-adv/hard-interface.c | 37 +++--------------- netnext/net/batman-adv/translation-table.c | 7 +-- 6 files changed, 10 insertions(+), 93 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 44 Tested Linux versions: 20 Tested configs: 39 master ------ Failed tests: 1 Started build tests: 43 Tested Linux versions: 15 Tested configs: 37

1 0

Build check errors found: 2018-07-18
by postmaster＠open-mesh.org 18 Jul '18

18 Jul '18

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/bat_iv_ogm.c | 4 -- net/net/batman-adv/bat_v.c | 4 -- net/net/batman-adv/debugfs.c | 40 ------------------------ net/net/batman-adv/debugfs.h | 11 ------ net/net/batman-adv/hard-interface.c | 37 +++------------------- net/net/batman-adv/translation-table.c | 7 +--- 6 files changed, 10 insertions(+), 93 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/Kconfig | 8 ++- netnext/net/batman-adv/bat_iv_ogm.c | 4 - netnext/net/batman-adv/bat_iv_ogm.h | 6 +- netnext/net/batman-adv/bat_v.c | 4 - netnext/net/batman-adv/bat_v_ogm.h | 6 +- netnext/net/batman-adv/debugfs.c | 42 -------------------- netnext/net/batman-adv/debugfs.h | 11 ----- netnext/net/batman-adv/hard-interface.c | 37 ++--------------- netnext/net/batman-adv/originator.c | 17 +++++--- netnext/net/batman-adv/translation-table.c | 7 --- netnext/net/batman-adv/types.h | 7 +-- 11 files changed, 37 insertions(+), 112 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 42 Tested Linux versions: 20 Tested configs: 38 maint ----- Failed tests: 1 Started build tests: 45 Tested Linux versions: 19 Tested configs: 41

1 0

Coverity Scan: Analysis completed for batctl
by scan-admin＠coverity.com 17 Jul '18

17 Jul '18

Your request for analysis of batctl has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Build ID: 219913 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 17 Jul '18

17 Jul '18

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Build ID: 219912 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Build check errors found: 2018-07-17
by postmaster＠open-mesh.org 17 Jul '18

17 Jul '18

Name of failed tests ==================== master ------ * checkpatch ./net/batman-adv/debugfs.c * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ master: checkpatch ./net/batman-adv/debugfs.c --------------------------------------------- CHECK: 'chache' may be misspelled - perhaps 'cache'? #121: FILE: ./net/batman-adv/debugfs.c:121: + * batadv_dat_cache_open() - Prepare file handler for reads from dat_chache total: 0 errors, 0 warnings, 1 checks, 474 lines checked maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/Kconfig | 6 +-- net/net/batman-adv/bat_iv_ogm.c | 4 -- net/net/batman-adv/bat_v.c | 4 -- net/net/batman-adv/bat_v_elp.c | 15 ++++++++- net/net/batman-adv/debugfs.c | 40 ------------------------ net/net/batman-adv/debugfs.h | 11 ------ net/net/batman-adv/hard-interface.c | 37 +++------------------- net/net/batman-adv/main.h | 2 - net/net/batman-adv/multicast.c | 29 +++-------------- net/net/batman-adv/soft-interface.c | 5 +-- net/net/batman-adv/translation-table.c | 7 +--- net/net/batman-adv/types.h | 23 +++++++------ 12 files changed, 49 insertions(+), 134 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 4 - netnext/net/batman-adv/bat_v.c | 4 - netnext/net/batman-adv/bridge_loop_avoidance.c | 2 netnext/net/batman-adv/debugfs.c | 40 ---------------- netnext/net/batman-adv/debugfs.h | 11 ---- netnext/net/batman-adv/hard-interface.c | 37 ++------------ netnext/net/batman-adv/translation-table.c | 7 -- 7 files changed, 11 insertions(+), 94 deletions(-) Statistics ========== master ------ Failed tests: 2 Started build tests: 44 Tested Linux versions: 20 Tested configs: 36 maint ----- Failed tests: 1 Started build tests: 43 Tested Linux versions: 19 Tested configs: 36

1 0

Build check errors found: 2018-07-16
by postmaster＠open-mesh.org 16 Jul '18

16 Jul '18

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * checkpatch ./net/batman-adv/debugfs.c * difference between net-next and batadv master Output of different failed tests ================================ master: checkpatch ./net/batman-adv/debugfs.c --------------------------------------------- CHECK: 'chache' may be misspelled - perhaps 'cache'? #121: FILE: ./net/batman-adv/debugfs.c:121: + * batadv_dat_cache_open() - Prepare file handler for reads from dat_chache total: 0 errors, 0 warnings, 1 checks, 474 lines checked maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/Kconfig | 6 +-- net/net/batman-adv/bat_iv_ogm.c | 4 -- net/net/batman-adv/bat_v.c | 4 -- net/net/batman-adv/bat_v_elp.c | 15 ++++++++- net/net/batman-adv/debugfs.c | 40 ------------------------ net/net/batman-adv/debugfs.h | 11 ------ net/net/batman-adv/hard-interface.c | 37 +++------------------- net/net/batman-adv/main.h | 2 - net/net/batman-adv/multicast.c | 29 +++-------------- net/net/batman-adv/soft-interface.c | 5 +-- net/net/batman-adv/translation-table.c | 7 +--- net/net/batman-adv/types.h | 23 +++++++------ 12 files changed, 49 insertions(+), 134 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 4 - netnext/net/batman-adv/bat_v.c | 4 - netnext/net/batman-adv/bridge_loop_avoidance.c | 2 netnext/net/batman-adv/debugfs.c | 40 ---------------- netnext/net/batman-adv/debugfs.h | 11 ---- netnext/net/batman-adv/hard-interface.c | 37 ++------------ netnext/net/batman-adv/translation-table.c | 7 -- 7 files changed, 11 insertions(+), 94 deletions(-) Statistics ========== maint ----- Failed tests: 1 Started build tests: 45 Tested Linux versions: 20 Tested configs: 39 master ------ Failed tests: 2 Started build tests: 42 Tested Linux versions: 19 Tested configs: 37

1 0

Build check errors found: 2018-07-15
by postmaster＠open-mesh.org 15 Jul '18

15 Jul '18

Name of failed tests ==================== master ------ * checkpatch ./net/batman-adv/debugfs.c * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ master: checkpatch ./net/batman-adv/debugfs.c --------------------------------------------- CHECK: 'chache' may be misspelled - perhaps 'cache'? #121: FILE: ./net/batman-adv/debugfs.c:121: + * batadv_dat_cache_open() - Prepare file handler for reads from dat_chache total: 0 errors, 0 warnings, 1 checks, 474 lines checked maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/Kconfig | 6 +-- net/net/batman-adv/bat_iv_ogm.c | 4 -- net/net/batman-adv/bat_v.c | 4 -- net/net/batman-adv/bat_v_elp.c | 15 ++++++++- net/net/batman-adv/debugfs.c | 40 ------------------------ net/net/batman-adv/debugfs.h | 11 ------ net/net/batman-adv/hard-interface.c | 37 +++------------------- net/net/batman-adv/main.h | 2 - net/net/batman-adv/multicast.c | 29 +++-------------- net/net/batman-adv/soft-interface.c | 5 +-- net/net/batman-adv/translation-table.c | 7 +--- net/net/batman-adv/types.h | 23 +++++++------ 12 files changed, 49 insertions(+), 134 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 4 - netnext/net/batman-adv/bat_v.c | 4 - netnext/net/batman-adv/bridge_loop_avoidance.c | 2 netnext/net/batman-adv/debugfs.c | 40 ---------------- netnext/net/batman-adv/debugfs.h | 11 ---- netnext/net/batman-adv/hard-interface.c | 37 ++------------ netnext/net/batman-adv/translation-table.c | 7 -- 7 files changed, 11 insertions(+), 94 deletions(-) Statistics ========== master ------ Failed tests: 2 Started build tests: 43 Tested Linux versions: 19 Tested configs: 39 maint ----- Failed tests: 1 Started build tests: 44 Tested Linux versions: 20 Tested configs: 37

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge July 2018