commits October 2021

commits@lists.open-mesh.org

1 participants
16 discussions

[linux-merge]linux integration; annotated tag, v5.15, created. v5.15
by postmaster＠open-mesh.org 31 Oct '21

31 Oct '21

The annotated tag, v5.15 has been created at dc7089468610f429e9264420c43d5a3625fd5d8b (tag) tagging 8bb7eca972ad531c9b149c0a51ab43a417385813 (commit) replaces v5.15-rc7 tagged by Linus Torvalds on Sun Oct 31 13:53:10 2021 -0700 - Shortlog ------------------------------------------------------------ Linux 5.15 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmF/AjYeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG1hkIAJ6sFDbvb4M4LMwf Slh2NVL9o5sLMBDzVwnVlyMSKDbMn1WBKreGssaLgZjGDc74lxsdSmw5l9MZm0JN xlq95Q6XFiuu+0qDHPWwfDz3JFO4TqW2ZLLPWk9NnkNbRXqccSrlVRi1RpgE1t3/ NUtS8CQLu6A2BYMc6mkk3aV6IwSNKOkWbM5eBHSvU4j8B6lLbNQop0AfO/wyY1xB U6LiVE1RpN/b7Yv+75ITtNzuHzVIBx6305FvSnOlKbMKKvIClt96Vd2OeuoEkK+6 wGU8JraB1+fc0GckAhynNrjWQWdvi0MAhFWWEJxjS20OGcV1rXDduNfkVNauO1Zn +dNyJ3s= =g9fz -----END PGP SIGNATURE----- Pavel Skripkin (1): net: batman-adv: fix error handling ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] maint's head updated: batman-adv: fix error handling (0631e082)
by postmaster＠open-mesh.org 26 Oct '21

26 Oct '21

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: 0631e082 batman-adv: fix error handling

1 0

[batman-adv] master: batman-adv: fix error handling (0631e082)
by postmaster＠open-mesh.org 26 Oct '21

26 Oct '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 0631e0825c8129cd3896926da62a09ac00bf13a0 Author: Pavel Skripkin <paskripkin(a)gmail.com> Date: Sun Oct 24 16:13:56 2021 +0300 batman-adv: fix error handling Syzbot reported ODEBUG warning in batadv_nc_mesh_free(). The problem was in wrong error handling in batadv_mesh_init(). Before this patch batadv_mesh_init() was calling batadv_mesh_free() in case of any batadv_*_init() calls failure. This approach may work well, when there is some kind of indicator, which can tell which parts of batadv are initialized; but there isn't any. All written above lead to cleaning up uninitialized fields. Even if we hide ODEBUG warning by initializing bat_priv->nc.work, syzbot was able to hit GPF in batadv_nc_purge_paths(), because hash pointer in still NULL. [1] To fix these bugs we can unwind batadv_*_init() calls one by one. It is good approach for 2 reasons: 1) It fixes bugs on error handling path 2) It improves the performance, since we won't call unneeded batadv_*_free() functions. So, this patch makes all batadv_*_init() clean up all allocated memory before returning with an error to no call correspoing batadv_*_free() and open-codes batadv_mesh_free() with proper order to avoid touching uninitialized fields. Link: https://lore.kernel.org/netdev/000000000000c87fbd05cef6bcb0@google.com/ [1] Reported-and-tested-by: syzbot+28b0702ada0bf7381f58(a)syzkaller.appspotmail.com Fixes: 21e838760727 ("[batman-adv] fix various race conditions during startup & shutdown") Signed-off-by: Pavel Skripkin <paskripkin(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0631e0825c8129cd3896926da62a09ac00bf13a0 net/batman-adv/bridge_loop_avoidance.c | 8 +++-- net/batman-adv/main.c | 56 ++++++++++++++++++++++++---------- net/batman-adv/network-coding.c | 4 ++- net/batman-adv/translation-table.c | 4 ++- 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 16697443..17687848 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1560,10 +1560,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv) return 0; bat_priv->bla.claim_hash = batadv_hash_new(128); - bat_priv->bla.backbone_hash = batadv_hash_new(32); + if (!bat_priv->bla.claim_hash) + return -ENOMEM; - if (!bat_priv->bla.claim_hash || !bat_priv->bla.backbone_hash) + bat_priv->bla.backbone_hash = batadv_hash_new(32); + if (!bat_priv->bla.backbone_hash) { + batadv_hash_destroy(bat_priv->bla.claim_hash); return -ENOMEM; + } batadv_hash_set_lock_class(bat_priv->bla.claim_hash, &batadv_claim_hash_lock_class_key); diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 3ddd66e4..5207cd8d 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -190,29 +190,41 @@ int batadv_mesh_init(struct net_device *soft_iface) bat_priv->gw.generation = 0; - ret = batadv_v_mesh_init(bat_priv); - if (ret < 0) - goto err; - ret = batadv_originator_init(bat_priv); - if (ret < 0) - goto err; + if (ret < 0) { + atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING); + goto err_orig; + } ret = batadv_tt_init(bat_priv); - if (ret < 0) - goto err; + if (ret < 0) { + atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING); + goto err_tt; + } + + ret = batadv_v_mesh_init(bat_priv); + if (ret < 0) { + atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING); + goto err_v; + } ret = batadv_bla_init(bat_priv); - if (ret < 0) - goto err; + if (ret < 0) { + atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING); + goto err_bla; + } ret = batadv_dat_init(bat_priv); - if (ret < 0) - goto err; + if (ret < 0) { + atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING); + goto err_dat; + } ret = batadv_nc_mesh_init(bat_priv); - if (ret < 0) - goto err; + if (ret < 0) { + atomic_set(&bat_priv->mesh_state, BATADV_MESH_DEACTIVATING); + goto err_nc; + } batadv_gw_init(bat_priv); batadv_mcast_init(bat_priv); @@ -222,8 +234,20 @@ int batadv_mesh_init(struct net_device *soft_iface) return 0; -err: - batadv_mesh_free(soft_iface); +err_nc: + batadv_dat_free(bat_priv); +err_dat: + batadv_bla_free(bat_priv); +err_bla: + batadv_v_mesh_free(bat_priv); +err_v: + batadv_tt_free(bat_priv); +err_tt: + batadv_originator_free(bat_priv); +err_orig: + batadv_purge_outstanding_packets(bat_priv, NULL); + atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); + return ret; } diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 9f06132e..0a7f1d36 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -152,8 +152,10 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv) &batadv_nc_coding_hash_lock_class_key); bat_priv->nc.decoding_hash = batadv_hash_new(128); - if (!bat_priv->nc.decoding_hash) + if (!bat_priv->nc.decoding_hash) { + batadv_hash_destroy(bat_priv->nc.coding_hash); goto err; + } batadv_hash_set_lock_class(bat_priv->nc.decoding_hash, &batadv_nc_decoding_hash_lock_class_key); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e0b3dace..4b7ad668 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -4162,8 +4162,10 @@ int batadv_tt_init(struct batadv_priv *bat_priv) return ret; ret = batadv_tt_global_init(bat_priv); - if (ret < 0) + if (ret < 0) { + batadv_tt_local_table_free(bat_priv); return ret; + } batadv_tvlv_handler_register(bat_priv, batadv_tt_tvlv_ogm_handler_v1, batadv_tt_tvlv_unicast_handler_v1,

1 0

[batman-adv] master: Merge branch 'maint' (06eadef8)
by postmaster＠open-mesh.org 26 Oct '21

26 Oct '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 06eadef89995b687681361c53a52362c1fdaa05f Merge: 936b926c 0631e082 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 26 16:45:06 2021 +0200 Merge branch 'maint' >--------------------------------------------------------------- 06eadef89995b687681361c53a52362c1fdaa05f net/batman-adv/bridge_loop_avoidance.c | 8 +++-- net/batman-adv/main.c | 56 ++++++++++++++++++++++++---------- net/batman-adv/network-coding.c | 4 ++- net/batman-adv/translation-table.c | 4 ++- 4 files changed, 52 insertions(+), 20 deletions(-)

1 0

[linux-merge]linux integration; annotated tag, v5.15-rc7, created. v5.15-rc7
by postmaster＠open-mesh.org 25 Oct '21

25 Oct '21

The annotated tag, v5.15-rc7 has been created at 46d7e6997a768a578d08ddf53f65e779dd1b1776 (tag) tagging 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea (commit) replaces v5.15-rc6 tagged by Linus Torvalds on Mon Oct 25 11:30:31 2021 -0700 - Shortlog ------------------------------------------------------------ Linux 5.15-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmF298ceHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGIJYH/1rsEFQQ6caeQdy1 z9eFIe48DNM4l7bFk+qEj2UAbzPdahVJ299Mg5fW0n2CDemOc9/n0b9TxQ37YObi mOzu0xwJVupIxkyFMPQSSc2q8aLm67NSpJy08DsmaNses5hSvu8x15RPHLQTybjt SwtKns+jpCq79P1GWbrB5e5UkLb0VNoxNp4L1U4pMrYGcEkJUXbaxNY2V/JcXdM7 Vtn+qN0T/J6V6QVftv0t8Ecj3bjEnmL3kZHaTaNg3dGeKRpCGyHc5lcBQ0cNFG6t vjZ9VbuhBzGI3TN2tHH5hpA1UXo7HPBBCwQqxF1jeGLGHULikYwZ3TAPWqL3QZqC 9cxr9SY= =p75d -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'netdev' (936b926c)
by postmaster＠open-mesh.org 21 Oct '21

21 Oct '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 936b926c733331df15bfa31ad90206a368bc0e6d Merge: 9881e811 a4dbfc15 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 21 08:58:06 2021 +0200 Merge branch 'netdev' >--------------------------------------------------------------- 936b926c733331df15bfa31ad90206a368bc0e6d compat-include/linux/etherdevice.h | 27 +++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 14 +++++++------- net/batman-adv/multicast.c | 2 +- net/batman-adv/routing.c | 3 ++- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/tvlv.c | 4 ++-- net/batman-adv/tvlv.h | 4 ++-- 8 files changed, 43 insertions(+), 15 deletions(-)

1 0

[batman-adv] ecsv/lm_master,master: batman-adv: create netdev->dev_addr assignment helpers (0b0f6f99)
by postmaster＠open-mesh.org 21 Oct '21

21 Oct '21

Repository : ssh://git@diktynna/batman-adv On branches: ecsv/lm_master,master >--------------------------------------------------------------- commit 0b0f6f99ea3cdb8af1cbd0c40467486ea0e12b72 Author: Jakub Kicinski <kuba(a)kernel.org> Date: Thu Sep 2 11:10:37 2021 -0700 batman-adv: create netdev->dev_addr assignment helpers Recent work on converting address list to a tree made it obvious we need an abstraction around writing netdev->dev_addr. Without such abstraction updating the main device address is invisible to the core. Introduce a number of helpers which for now just wrap memcpy() but in the future can make necessary changes to the address tree. Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: convert to compat helper] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0b0f6f99ea3cdb8af1cbd0c40467486ea0e12b72 compat-include/linux/etherdevice.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/compat-include/linux/etherdevice.h b/compat-include/linux/etherdevice.h new file mode 100644 index 00000000..f515c348 --- /dev/null +++ b/compat-include/linux/etherdevice.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ETHERDEVICE_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ETHERDEVICE_H_ + +#include <linux/version.h> +#include_next <linux/etherdevice.h> + +#if LINUX_VERSION_IS_LESS(5, 15, 0) + +static inline void batadv_eth_hw_addr_set(struct net_device *dev, + const u8 *addr) +{ + ether_addr_copy(dev->dev_addr, addr); +} +#define eth_hw_addr_set batadv_eth_hw_addr_set + +#endif /* LINUX_VERSION_IS_LESS(5, 15, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ETHERDEVICE_H_ */

1 0

[batman-adv] ecsv/lm_master,master: batman-adv: use eth_hw_addr_set() instead of ether_addr_copy() (a4dbfc15)
by postmaster＠open-mesh.org 21 Oct '21

21 Oct '21

Repository : ssh://git@diktynna/batman-adv On branches: ecsv/lm_master,master >--------------------------------------------------------------- commit a4dbfc15a07ea34d610aa391de1d847bd5b9312d Author: Jakub Kicinski <kuba(a)kernel.org> Date: Tue Oct 19 09:39:27 2021 -0700 batman-adv: use eth_hw_addr_set() instead of ether_addr_copy() Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers. Convert batman from ether_addr_copy() to eth_hw_addr_set(): @@ expression dev, np; @@ - ether_addr_copy(dev->dev_addr, np) + eth_hw_addr_set(dev, np) Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a4dbfc15a07ea34d610aa391de1d847bd5b9312d net/batman-adv/soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0604b027..7ee09337 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -134,7 +134,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) return -EADDRNOTAVAIL; ether_addr_copy(old_addr, dev->dev_addr); - ether_addr_copy(dev->dev_addr, addr->sa_data); + eth_hw_addr_set(dev, addr->sa_data); /* only modify transtable if it has been initialized before */ if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)

1 0

[batman-adv] master: batman-adv: use eth_hw_addr_set() instead of ether_addr_copy() (6c69b5d8)
by postmaster＠open-mesh.org 20 Oct '21

20 Oct '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 6c69b5d80455b18fffb2e43f930832a325e9f302 Author: Jakub Kicinski <kuba(a)kernel.org> Date: Tue Oct 19 09:39:27 2021 -0700 batman-adv: use eth_hw_addr_set() instead of ether_addr_copy() Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers. Convert batman from ether_addr_copy() to eth_hw_addr_set(): @@ expression dev, np; @@ - ether_addr_copy(dev->dev_addr, np) + eth_hw_addr_set(dev, np) Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6c69b5d80455b18fffb2e43f930832a325e9f302 net/batman-adv/soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 0604b027..7ee09337 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -134,7 +134,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) return -EADDRNOTAVAIL; ether_addr_copy(old_addr, dev->dev_addr); - ether_addr_copy(dev->dev_addr, addr->sa_data); + eth_hw_addr_set(dev, addr->sa_data); /* only modify transtable if it has been initialized before */ if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)

1 0

[batman-adv] master: batman-adv: make use of helper netif_is_bridge_master() (189360c7)
by postmaster＠open-mesh.org 20 Oct '21

20 Oct '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 189360c71c31ade509f1b0829bf997610a251932 Author: Kyungrok Chung <acadx0(a)gmail.com> Date: Sat Oct 16 20:21:36 2021 +0900 batman-adv: make use of helper netif_is_bridge_master() Make use of netdev helper functions to improve code readability. Replace 'dev->priv_flags & IFF_EBRIDGE' with netif_is_bridge_master(dev). Signed-off-by: Kyungrok Chung <acadx0(a)gmail.com> Reviewed-by: Nikolay Aleksandrov <nikolay(a)nvidia.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 189360c71c31ade509f1b0829bf997610a251932 net/batman-adv/multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index a3b6658e..433901dc 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -89,7 +89,7 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) rcu_read_lock(); do { upper = netdev_master_upper_dev_get_rcu(upper); - } while (upper && !(upper->priv_flags & IFF_EBRIDGE)); + } while (upper && !netif_is_bridge_master(upper)); dev_hold(upper); rcu_read_unlock();

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2021