commits August 2023

commits@lists.open-mesh.org

1 participants
59 discussions

[linux-merge]linux integration; annotated tag, v6.5, created. v6.5
by postmaster＠open-mesh.org 27 Aug '23

27 Aug '23

The annotated tag, v6.5 has been created at 52e12027d50affbf60c6c9c64db8017391b0c22e (tag) tagging 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (commit) replaces v6.5-rc7 tagged by Linus Torvalds on Sun Aug 27 14:49:51 2023 -0700 - Shortlog ------------------------------------------------------------ Linux 6.5 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmTrxP8eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGJsAH/iQYfQGPtWf0NAB0 qHQm+pyijdUMVGxe7Ornz7zz9tnFfck9HOKb8DDVod3qg6/LgDXpmJAwA6vZ9WhX MpY66T8uKa4ryxLF0ir8XHPNCkwKC3XUl1Nrh/g775CWZW6I7OvAcf4w+rYU+LPZ zd9mMjnGcNPLk8mJZ4L4yEt/Qm4q6Op5nn7FMUNTc2qKdaqSeBGo81XQi4H1f5Pw D3aFyOz7gFeW7ATtacv8oBJVFrkAQ4FUikq8EcDYBuAryCjZAvVALDPITVibzXs6 hat2fYMIiS4O670mQ5FG0oM7Dk89XAvRFWfFY2hC9SpeRinsdb3qbdki7vqGZ+Nn 52amP6c= =Q9cA -----END PGP SIGNATURE----- Remi Pommarel (3): batman-adv: Do not get eth header before batadv_check_management_packet batman-adv: Fix TT global entry leak when client roamed back batman-adv: Fix batadv_v_ogm_aggr_send memory leak Sven Eckelmann (3): batman-adv: Trigger events for auto adjusted MTU batman-adv: Don't increase MTU when set by user batman-adv: Hold rtnl lock during MTU update via netlink ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] stable's head updated: batman-adv: Hold rtnl lock during MTU update via netlink (aeb35331)
by postmaster＠open-mesh.org 22 Aug '23

22 Aug '23

Repository : ssh://git@diktynna/batman-adv Branch 'stable' now includes: 57571bca batman-adv: Start new development cycle 8e52ef4c Merge branch 'stable' f779cdaf Merge branch 'stable' ed12d0c1 Merge branch 'stable' 7225bc2a Merge branch 'stable' 9024db26 batman-adv: Fix batadv_v_ogm_aggr_send memory leak 67f427d8 Merge branch 'stable' 44334edf batman-adv: Update CHANGELOG for upcoming release 9fa2960f batman-adv: Update compatible kernel version number aeb35331 batman-adv: Hold rtnl lock during MTU update via netlink

1 0

[batman-adv] main,main: Merge branch 'stable' (5fecd4a3)
by postmaster＠open-mesh.org 22 Aug '23

22 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 5fecd4a389cea1b9719e9ec480d7257887e0dfdf Merge: 8f8bf8c8 aeb35331 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Aug 22 18:19:25 2023 +0200 Merge branch 'stable' >--------------------------------------------------------------- 5fecd4a389cea1b9719e9ec480d7257887e0dfdf net/batman-adv/netlink.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[batman-adv] main,stable,main,stable: batman-adv: Hold rtnl lock during MTU update via netlink (aeb35331)
by postmaster＠open-mesh.org 22 Aug '23

22 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,stable,main,stable >--------------------------------------------------------------- commit aeb35331aa9a17f9affd84c1a5b020aeb4a976f4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 21 21:48:48 2023 +0200 batman-adv: Hold rtnl lock during MTU update via netlink The automatic recalculation of the maximum allowed MTU is usually triggered by code sections which are already rtnl lock protected by callers outside of batman-adv. But when the fragmentation setting is changed via batman-adv's own batadv genl family, then the rtnl lock is not yet taken. But dev_set_mtu requires that the caller holds the rtnl lock because it uses netdevice notifiers. And this code will then fail the check for this lock: RTNL: assertion failed at net/core/dev.c (1953) Cc: stable(a)vger.kernel.org Reported-by: syzbot+f8812454d9b3ac00d282(a)syzkaller.appspotmail.com Fixes: 27c4d7c1c7fa ("batman-adv: Trigger events for auto adjusted MTU") Reviewed-by: Simon Horman <horms(a)kernel.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- aeb35331aa9a17f9affd84c1a5b020aeb4a976f4 net/batman-adv/netlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 07f21cdb..ae0c42f5 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -495,7 +495,10 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) attr = info->attrs[BATADV_ATTR_FRAGMENTATION_ENABLED]; atomic_set(&bat_priv->fragmentation, !!nla_get_u8(attr)); + + rtnl_lock(); batadv_update_min_mtu(bat_priv->soft_iface); + rtnl_unlock(); } if (info->attrs[BATADV_ATTR_GW_BANDWIDTH_DOWN]) {

1 0

[batman-adv] main's head updated: Merge branch 'stable' (e5394291)
by postmaster＠open-mesh.org 22 Aug '23

22 Aug '23

Repository : ssh://git@diktynna/batman-adv Branch 'main' now includes: 840f089c batman-adv: Fix batadv_v_ogm_aggr_send memory leak 78c28f81 batman-adv: Hold rtnl lock during MTU update via netlink e5394291 Merge branch 'stable'

1 0

[batman-adv] main,main: Merge branch 'stable' (e5394291)
by postmaster＠open-mesh.org 22 Aug '23

22 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit e5394291c22577a95b838eb0894f14a2c665aab0 Merge: 8f8bf8c8 78c28f81 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Aug 22 18:05:52 2023 +0200 Merge branch 'stable' >--------------------------------------------------------------- e5394291c22577a95b838eb0894f14a2c665aab0 net/batman-adv/netlink.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[batman-adv] main,stable,main,stable: batman-adv: Hold rtnl lock during MTU update via netlink (78c28f81)
by postmaster＠open-mesh.org 22 Aug '23

22 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,stable,main,stable >--------------------------------------------------------------- commit 78c28f810b682ce960ad62e9c9f23500c990304f Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 21 21:48:48 2023 +0200 batman-adv: Hold rtnl lock during MTU update via netlink The automatic recalculation of the maximum allowed MTU is usually triggered by code sections which are already rtnl lock protected by callers outside of batman-adv. But when the fragmentation setting is changed via batman-adv's own batadv genl family, then the rtnl lock is not yet taken. But dev_set_mtu requires that the caller holds the rtnl lock because it uses netdevice notifiers. And this code will then fail the check for this lock: RTNL: assertion failed at net/core/dev.c (1953) Cc: stable(a)vger.kernel.org Reported-by: syzbot+f8812454d9b3ac00d282(a)syzkaller.appspotmail.com Fixes: 27c4d7c1c7fa ("batman-adv: Trigger events for auto adjusted MTU") Reviewed-by: Simon Horman <horms(a)kernel.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 78c28f810b682ce960ad62e9c9f23500c990304f net/batman-adv/netlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 07f21cdb..ae0c42f5 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -495,7 +495,10 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) attr = info->attrs[BATADV_ATTR_FRAGMENTATION_ENABLED]; atomic_set(&bat_priv->fragmentation, !!nla_get_u8(attr)); + + rtnl_lock(); batadv_update_min_mtu(bat_priv->soft_iface); + rtnl_unlock(); } if (info->attrs[BATADV_ATTR_GW_BANDWIDTH_DOWN]) {

1 0

[linux-merge]linux integration; branch, batadv/net, updated. batadv-net-pullrequest-20230816-1-gdc2bfc8f2998
by postmaster＠open-mesh.org 21 Aug '23

21 Aug '23

The following commit has been merged in the batadv/net branch: commit dc2bfc8f2998d95a7c9671e503d8322552bb57ad Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Aug 21 20:51:14 2023 +0200 batman-adv: Hold rtnl lock during MTU update via netlink The automatic recalculation of the maximum allowed MTU is usually triggered by code sections which are already rtnl lock protected by callers outside of batman-adv. But when the fragmentation setting is changed via batman-adv's own batadv genl family, then the rtnl lock is not yet taken. But dev_set_mtu requires that the caller holds the rtnl lock because it uses netdevice notifiers. And this code will then fail the check for this lock: RTNL: assertion failed at net/core/dev.c (1953) Cc: stable(a)vger.kernel.org Reported-by: syzbot+f8812454d9b3ac00d282(a)syzkaller.appspotmail.com Fixes: c6a953cce8d0 ("batman-adv: Trigger events for auto adjusted MTU") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index ad5714f737be..6efbc9275aec 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -495,7 +495,10 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) attr = info->attrs[BATADV_ATTR_FRAGMENTATION_ENABLED]; atomic_set(&bat_priv->fragmentation, !!nla_get_u8(attr)); + + rtnl_lock(); batadv_update_min_mtu(bat_priv->soft_iface); + rtnl_unlock(); } if (info->attrs[BATADV_ATTR_GW_BANDWIDTH_DOWN]) { -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.5-rc7, created. v6.5-rc7
by postmaster＠open-mesh.org 20 Aug '23

20 Aug '23

The annotated tag, v6.5-rc7 has been created at 73a6c7d018fee97e1ba2eff68b795fe08a9ddd76 (tag) tagging 706a741595047797872e669b3101429ab8d378ef (commit) replaces v6.5-rc6 tagged by Linus Torvalds on Sun Aug 20 15:02:52 2023 +0200 - Shortlog ------------------------------------------------------------ Linux 6.5-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmTiDvweHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG7doH/2Poj73npPKPVfT3 RF8AsgvAj2pLby67rdvwTdFX+exS63SsuwtGGRfAHfGabiwmNN+oT2dLb0aY15bp nskHnFpcqQ/pfZ2i2rUCenzBX8S9QULvPidLKRaf1FcSdOzqd97Bw5oDPMtzqy/R Pm+Dzs//7fYvtm69nt6hKW4d6wXxNcg7Fk/QgoJ5Ax9vGvDuZmWXH0ZgBf/5kH04 TTPQNtVX57lf+FHugkhFEn4JbYXvN168b+LuX2PHwOeG/8AIS69Hc0vgvhHNAycT mmpUI1gWA2jfrJ2RCyyezF/6wy9Ocsp+CbPjfwjuRUxOk0XIm1+cp9Mlz/cRbMsZ f0tOTpk= =xrJp -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] main,main: batman-adv: Drop per algo GW section class code (8f8bf8c8)
by postmaster＠open-mesh.org 16 Aug '23

16 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 8f8bf8c881ce7255ba10c6433627700928b50536 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 2 12:00:24 2023 +0200 batman-adv: Drop per algo GW section class code This code was only used in the past for the sysfs interface. But since this was replace with netlink, it was never executed. The function pointer was only checked to figure out whether the limit 255 (B.A.T.M.A.N. IV) or 2**32-1 (B.A.T.M.A.N. V) should be used as limit. So instead of keeping the function pointer, just store the limits directly in struct batadv_algo_gw_ops. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8f8bf8c881ce7255ba10c6433627700928b50536 net/batman-adv/bat_iv_ogm.c | 1 + net/batman-adv/bat_v.c | 23 ++----------- net/batman-adv/gateway_common.c | 74 +---------------------------------------- net/batman-adv/gateway_common.h | 5 --- net/batman-adv/netlink.c | 5 +-- net/batman-adv/types.h | 7 ++-- 6 files changed, 8 insertions(+), 107 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 828fb393..74b49c35 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2516,6 +2516,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { }, .gw = { .init_sel_class = batadv_iv_init_sel_class, + .sel_class_max = BATADV_TQ_MAX_VALUE, .get_best_gw_node = batadv_iv_gw_get_best_gw_node, .is_eligible = batadv_iv_gw_is_eligible, .dump = batadv_iv_gw_dump, diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 54e41fc7..ac11f1f0 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/jiffies.h> #include <linux/kref.h> +#include <linux/limits.h> #include <linux/list.h> #include <linux/minmax.h> #include <linux/netdevice.h> @@ -34,7 +35,6 @@ #include "bat_v_elp.h" #include "bat_v_ogm.h" #include "gateway_client.h" -#include "gateway_common.h" #include "hard-interface.h" #include "hash.h" #include "log.h" @@ -512,25 +512,6 @@ static void batadv_v_init_sel_class(struct batadv_priv *bat_priv) atomic_set(&bat_priv->gw.sel_class, 50); } -static ssize_t batadv_v_store_sel_class(struct batadv_priv *bat_priv, - char *buff, size_t count) -{ - u32 old_class, class; - - if (!batadv_parse_throughput(bat_priv->soft_iface, buff, - "B.A.T.M.A.N. V GW selection class", - &class)) - return -EINVAL; - - old_class = atomic_read(&bat_priv->gw.sel_class); - atomic_set(&bat_priv->gw.sel_class, class); - - if (old_class != class) - batadv_gw_reselect(bat_priv); - - return count; -} - /** * batadv_v_gw_throughput_get() - retrieve the GW-bandwidth for a given GW * @gw_node: the GW to retrieve the metric for @@ -818,7 +799,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { }, .gw = { .init_sel_class = batadv_v_init_sel_class, - .store_sel_class = batadv_v_store_sel_class, + .sel_class_max = U32_MAX, .get_best_gw_node = batadv_v_gw_get_best_gw_node, .is_eligible = batadv_v_gw_is_eligible, .dump = batadv_v_gw_dump, diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index d9632607..2dd36ef0 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -9,86 +9,14 @@ #include <linux/atomic.h> #include <linux/byteorder/generic.h> -#include <linux/kstrtox.h> -#include <linux/limits.h> -#include <linux/math64.h> -#include <linux/netdevice.h> #include <linux/stddef.h> -#include <linux/string.h> +#include <linux/types.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> #include "gateway_client.h" -#include "log.h" #include "tvlv.h" -/** - * batadv_parse_throughput() - parse supplied string buffer to extract - * throughput information - * @net_dev: the soft interface net device - * @buff: string buffer to parse - * @description: text shown when throughput string cannot be parsed - * @throughput: pointer holding the returned throughput information - * - * Return: false on parse error and true otherwise. - */ -bool batadv_parse_throughput(struct net_device *net_dev, char *buff, - const char *description, u32 *throughput) -{ - enum batadv_bandwidth_units bw_unit_type = BATADV_BW_UNIT_KBIT; - u64 lthroughput; - char *tmp_ptr; - int ret; - - if (strlen(buff) > 4) { - tmp_ptr = buff + strlen(buff) - 4; - - if (strncasecmp(tmp_ptr, "mbit", 4) == 0) - bw_unit_type = BATADV_BW_UNIT_MBIT; - - if (strncasecmp(tmp_ptr, "kbit", 4) == 0 || - bw_unit_type == BATADV_BW_UNIT_MBIT) - *tmp_ptr = '\0'; - } - - ret = kstrtou64(buff, 10, &lthroughput); - if (ret) { - batadv_err(net_dev, - "Invalid throughput speed for %s: %s\n", - description, buff); - return false; - } - - switch (bw_unit_type) { - case BATADV_BW_UNIT_MBIT: - /* prevent overflow */ - if (U64_MAX / 10 < lthroughput) { - batadv_err(net_dev, - "Throughput speed for %s too large: %s\n", - description, buff); - return false; - } - - lthroughput *= 10; - break; - case BATADV_BW_UNIT_KBIT: - default: - lthroughput = div_u64(lthroughput, 100); - break; - } - - if (lthroughput > U32_MAX) { - batadv_err(net_dev, - "Throughput speed for %s too large: %s\n", - description, buff); - return false; - } - - *throughput = lthroughput; - - return true; -} - /** * batadv_gw_tvlv_container_update() - update the gw tvlv container after * gateway setting change diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index cb2e72d7..5d097d6a 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -9,9 +9,6 @@ #include "main.h" -#include <linux/netdevice.h> -#include <linux/types.h> - /** * enum batadv_bandwidth_units - bandwidth unit types */ @@ -30,7 +27,5 @@ enum batadv_bandwidth_units { void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv); void batadv_gw_init(struct batadv_priv *bat_priv); void batadv_gw_free(struct batadv_priv *bat_priv); -bool batadv_parse_throughput(struct net_device *net_dev, char *buff, - const char *description, u32 *throughput); #endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */ diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 09b76b0f..4ddcc21b 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -548,15 +548,12 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) * algorithm in use implements the GW API */ - u32 sel_class_max = 0xffffffffu; + u32 sel_class_max = bat_priv->algo_ops->gw.sel_class_max; u32 sel_class; attr = info->attrs[BATADV_ATTR_GW_SEL_CLASS]; sel_class = nla_get_u32(attr); - if (!bat_priv->algo_ops->gw.store_sel_class) - sel_class_max = BATADV_TQ_MAX_VALUE; - if (sel_class >= 1 && sel_class <= sel_class_max) { atomic_set(&bat_priv->gw.sel_class, sel_class); batadv_gw_reselect(bat_priv); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index cf1a0eaf..17d5ea1d 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -2197,11 +2197,10 @@ struct batadv_algo_gw_ops { void (*init_sel_class)(struct batadv_priv *bat_priv); /** - * @store_sel_class: parse and stores a new GW selection class - * (optional) + * @sel_class_max: maximum allowed GW selection class */ - ssize_t (*store_sel_class)(struct batadv_priv *bat_priv, char *buff, - size_t count); + u32 sel_class_max; + /** * @get_best_gw_node: select the best GW from the list of available * nodes (optional)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2023