commits

commits@lists.open-mesh.org

1 participants
12373 discussions

[linux-merge]linux integration; annotated tag, v6.6.22, created. v6.6.22
by postmaster＠open-mesh.org 25 Mar '24

25 Mar '24

The annotated tag, v6.6.22 has been created at d56df17159811e34730fcbc481b07a257e4540f1 (tag) tagging 6a646d9fe8a2bf8d25817ceddf96dfc5eb5446db (commit) replaces v6.6.21 tagged by Sasha Levin on Fri Mar 15 14:54:37 2024 -0400 - Shortlog ------------------------------------------------------------ Linux 6.6.22 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmX0mXEACgkQ3qZv95d3 LNwhWg//a+3NTSsYLJ5LPgdfHhzkK3crj30pkpOjsTDp6PBJQA6BVv+P4Ubt5yBr OuBFnNlTh3Tp4Au2fxgJqBGdweyJv7/qc/B8hzsS6+KrVlBwxGhNKxBcCZZ5xiCK yh/bu3E+RP7Mk21O1vxERz8Ur/dZIVSlNjtXynf8zUnHwVWB3Jt/XqysKTARLulP iFTgkDXvvEvIfKPtqpnL9/1PRoWa/y6LYD/7kj8R7LHiXpTsICy+NdqN1LH6/Vje K9nO6A2APTToCWOZ4dakOpm8H+NRMF/hURHCtR5N6dNcIpSXFfLgguxyd9/WbRzG zASQKUJb8ppon3wNF/wJvt0QuYdwp2bOtP5DZaVpKUb7XKriManDyPDvWoShNcrb PI05f2AeJmhksA2Z3yAs4C91eJejWJr4OJWaHNkc3VwyuqJhmBIYUHIAv8sRPSOm uEsO9rUZKkdsBHcA07SkqxrkJh9YBA6pVoKXz71jln8Kq74v6zKBJKM3pOxGmHr+ fzOBRykgQ5v3cPBj2OU6cUR1ruxWn50B1vaULTK7/ORHiGBBU4TN8VkOHEL2dEzB dI6XAKUEajBZIExf6eKpzFJCkqnz5upkeskqG7uMKP5Y8Tuu5iBtKurJSxA3ePoC PySebvnh4/pUVBPqOtcS8wgrpQjF8dG8FQIr9xooiyW+o6pU7T0= =ym/k -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.9-rc1, created. v6.9-rc1
by postmaster＠open-mesh.org 24 Mar '24

24 Mar '24

The annotated tag, v6.9-rc1 has been created at 9bd5def24522bfec169de38754165379b4f8d6f5 (tag) tagging 4cece764965020c22cff7665b18a012006359095 (commit) replaces v6.8 tagged by Linus Torvalds on Sun Mar 24 14:10:05 2024 -0700 - Shortlog ------------------------------------------------------------ Linux 6.9-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmYAlq0eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGYqwH/0fb4pRbVtULpiIK Cs7/e/IWzRRWLBq+Jj2KVVTxwjyiKFNOq6K/CHHnljIWo1yN2CIWeOgbHfTI0WfN xmBdJP7OtK8MCN9PwwoWhZxMLcyv4pFCERrrkGa7AD+cdN4j/ytQ3mH5V8f/21fd rnpQSdpgGXB2SSMHd520Y+e56+gxrrTmsDXjZWM08Wt0bbqAWJrjNe58BMz5hI1t yQtcgYRTdUuZBn5TMkT99lK9EFQslV38YCo7RUP5D0DWXS1jSfWlgnCD1Nc1ziF4 ps/xPdUMDJAc5Tslg/hgJOciSuLqgMzIUsVgZrKysuu3NhwDY1LDWGORmH1t8E8W RC25950= =F+01 -----END PGP SIGNATURE----- David S. Miller (1): Merge tag 'batadv-next-pullrequest-20240201' of git://git.open-mesh.org/linux-merge Jakub Kicinski (1): Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Markus Elfring (2): batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() batman-adv: Improve exception handling in batadv_throw_uevent() Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (1): batman-adv: Drop usage of export.h ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.8-rc1-5-ge2b4fbdbf66f4
by postmaster＠open-mesh.org 19 Mar '24

19 Mar '24

The following commit has been merged in the batadv/net-next branch: commit e2b4fbdbf66f4380940f641374f8c6439f8505fc Author: Dmitry Antipov <dmantipov(a)yandex.ru> Date: Tue Mar 12 21:16:28 2024 +0300 batman-adv: prefer kfree_rcu() over call_rcu() with free-only callbacks Drop 'batadv_tt_local_entry_free_rcu()', 'batadv_tt_global_entry_free_rcu()' and 'batadv_tt_orig_list_entry_free_rcu()' in favor of 'kfree_rcu()' in 'batadv_tt_local_entry_release()', 'batadv_tt_global_entry_release()' and 'batadv_tt_orig_list_entry_release()', respectively. Signed-off-by: Dmitry Antipov <dmantipov(a)yandex.ru> Acked-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 b95c36765d045..0555cb6114898 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -208,20 +208,6 @@ batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, return tt_global_entry; } -/** - * batadv_tt_local_entry_free_rcu() - free the tt_local_entry - * @rcu: rcu pointer of the tt_local_entry - */ -static void batadv_tt_local_entry_free_rcu(struct rcu_head *rcu) -{ - struct batadv_tt_local_entry *tt_local_entry; - - tt_local_entry = container_of(rcu, struct batadv_tt_local_entry, - common.rcu); - - kmem_cache_free(batadv_tl_cache, tt_local_entry); -} - /** * batadv_tt_local_entry_release() - release tt_local_entry from lists and queue * for free after rcu grace period @@ -236,7 +222,7 @@ static void batadv_tt_local_entry_release(struct kref *ref) batadv_softif_vlan_put(tt_local_entry->vlan); - call_rcu(&tt_local_entry->common.rcu, batadv_tt_local_entry_free_rcu); + kfree_rcu(tt_local_entry, common.rcu); } /** @@ -254,20 +240,6 @@ batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry) batadv_tt_local_entry_release); } -/** - * batadv_tt_global_entry_free_rcu() - free the tt_global_entry - * @rcu: rcu pointer of the tt_global_entry - */ -static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu) -{ - struct batadv_tt_global_entry *tt_global_entry; - - tt_global_entry = container_of(rcu, struct batadv_tt_global_entry, - common.rcu); - - kmem_cache_free(batadv_tg_cache, tt_global_entry); -} - /** * batadv_tt_global_entry_release() - release tt_global_entry from lists and * queue for free after rcu grace period @@ -282,7 +254,7 @@ void batadv_tt_global_entry_release(struct kref *ref) batadv_tt_global_del_orig_list(tt_global_entry); - call_rcu(&tt_global_entry->common.rcu, batadv_tt_global_entry_free_rcu); + kfree_rcu(tt_global_entry, common.rcu); } /** @@ -407,19 +379,6 @@ static void batadv_tt_global_size_dec(struct batadv_orig_node *orig_node, batadv_tt_global_size_mod(orig_node, vid, -1); } -/** - * batadv_tt_orig_list_entry_free_rcu() - free the orig_entry - * @rcu: rcu pointer of the orig_entry - */ -static void batadv_tt_orig_list_entry_free_rcu(struct rcu_head *rcu) -{ - struct batadv_tt_orig_list_entry *orig_entry; - - orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu); - - kmem_cache_free(batadv_tt_orig_cache, orig_entry); -} - /** * batadv_tt_orig_list_entry_release() - release tt orig entry from lists and * queue for free after rcu grace period @@ -433,7 +392,7 @@ static void batadv_tt_orig_list_entry_release(struct kref *ref) refcount); batadv_orig_node_put(orig_entry->orig_node); - call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu); + kfree_rcu(orig_entry, rcu); } /** -- linux integration

1 0

[batman-adv] main,stable,main,stable: batman-adv: Avoid infinite loop trying to resize local TT (05f6eadb)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv On branches: main,stable,main,stable >--------------------------------------------------------------- commit 05f6eadbbddc834669249ae204026c383445b571 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 12 14:32:13 2024 +0100 batman-adv: Avoid infinite loop trying to resize local TT If the MTU of one of an attached interface becomes too small to transmit the local translation table then it must be resized to fit inside all fragments (when enabled) or a single packet. But if the MTU becomes too low to transmit even the header + the VLAN specific part then the resizing of the local TT will never succeed. This can for example happen when the usable space is 110 bytes and 11 VLANs are on top of batman-adv. In this case, at least 116 byte would be needed. There will just be an endless spam of batman_adv: batadv0: Forced to purge local tt entries to fit new maximum fragment MTU (110) in the log but the function will never finish. Problem here is that the timeout will be halved all the time and will then stagnate at 0 and therefore never be able to reduce the table even more. There are other scenarios possible with a similar result. The number of BATADV_TT_CLIENT_NOPURGE entries in the local TT can for example be too high to fit inside a packet. Such a scenario can therefore happen also with only a single VLAN + 7 non-purgable addresses - requiring at least 120 bytes. While this should be handled proactively when: * interface with too low MTU is added * VLAN is added * non-purgeable local mac is added * MTU of an attached interface is reduced * fragmentation setting gets disabled (which most likely requires dropping attached interfaces) not all of these scenarios can be prevented because batman-adv is only consuming events without the the possibility to prevent these actions (non-purgable MAC address added, MTU of an attached interface is reduced). It is therefore necessary to also make sure that the code is able to handle also the situations when there were already incompatible system configuration are present. Cc: stable(a)vger.kernel.org Fixes: f7f2fe494388 ("batman-adv: limit local translation table max size") Reported-by: syzbot+a6a4b5bb3da165594cff(a)syzkaller.appspotmail.com Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 05f6eadbbddc834669249ae204026c383445b571 net/batman-adv/translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index b95c3676..2243cec1 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -3948,7 +3948,7 @@ void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface) spin_lock_bh(&bat_priv->tt.commit_lock); - while (true) { + while (timeout) { table_size = batadv_tt_local_table_transmit_size(bat_priv); if (packet_size_max >= table_size) break;

1 0

[batman-adv] main,main: batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() (bfeb9d0e)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit bfeb9d0ea60a5f6099a5d3b3d41df44003c7fc92 Author: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue Jan 2 07:27:45 2024 +0100 batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() The kfree() function was called in one case by the batadv_dat_forward_data() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus return directly after a batadv_dat_select_candidates() call failed at the beginning. * Delete the label “out” which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bfeb9d0ea60a5f6099a5d3b3d41df44003c7fc92 net/batman-adv/distributed-arp-table.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 28a939d5..4c7e8553 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, cand = batadv_dat_select_candidates(bat_priv, ip, vid); if (!cand) - goto out; + return ret; batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip); @@ -728,7 +728,6 @@ free_orig: batadv_orig_node_put(cand[i].orig_node); } -out: kfree(cand); return ret; }

1 0

[batman-adv] main,main: Merge branch 'stable' (fa7059d9)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit fa7059d922e5e2a60f35b92b80b6b89c1c557179 Merge: 737a0703 05f6eadb Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 24 07:58:55 2024 +0100 Merge branch 'stable' >--------------------------------------------------------------- fa7059d922e5e2a60f35b92b80b6b89c1c557179 net/batman-adv/translation-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[batman-adv] main,main: batman-adv: Start new development cycle (d53299d0)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit d53299d062e0347fd029b916cf619012ebdf7c7b Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Feb 1 10:59:49 2024 +0100 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- d53299d062e0347fd029b916cf619012ebdf7c7b net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 870dcd7f..8ca854a7 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2024.0" +#define BATADV_SOURCE_VERSION "2024.1" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] main,main: batman-adv: Improve exception handling in batadv_throw_uevent() (73828bad)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 73828bad18df5e6376cc49db35b291919b6cbcc4 Author: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue Jan 2 07:52:21 2024 +0100 batman-adv: Improve exception handling in batadv_throw_uevent() The kfree() function was called in up to three cases by the batadv_throw_uevent() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus adjust jump targets. * Reorder kfree() calls at the end. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 73828bad18df5e6376cc49db35b291919b6cbcc4 net/batman-adv/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 5fc754b0..75119f1f 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -691,29 +691,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, "%s%s", BATADV_UEV_TYPE_VAR, batadv_uev_type_str[type]); if (!uevent_env[0]) - goto out; + goto report_error; uevent_env[1] = kasprintf(GFP_ATOMIC, "%s%s", BATADV_UEV_ACTION_VAR, batadv_uev_action_str[action]); if (!uevent_env[1]) - goto out; + goto free_first_env; /* If the event is DEL, ignore the data field */ if (action != BATADV_UEV_DEL) { uevent_env[2] = kasprintf(GFP_ATOMIC, "%s%s", BATADV_UEV_DATA_VAR, data); if (!uevent_env[2]) - goto out; + goto free_second_env; } ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); -out: - kfree(uevent_env[0]); - kfree(uevent_env[1]); kfree(uevent_env[2]); +free_second_env: + kfree(uevent_env[1]); +free_first_env: + kfree(uevent_env[0]); if (ret) +report_error: batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n", batadv_uev_type_str[type],

1 0

[batman-adv] main's head updated: Merge branch 'stable' (fa7059d9)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv Branch 'main' now includes: 3f2b64e9 batman-adv: Update CHANGELOG for upcoming release 7ee009fb batman-adv: Update compatible kernel version number d53299d0 batman-adv: Start new development cycle bfeb9d0e batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() 73828bad batman-adv: Improve exception handling in batadv_throw_uevent() 737a0703 batman-adv: Drop usage of export.h 05f6eadb batman-adv: Avoid infinite loop trying to resize local TT fa7059d9 Merge branch 'stable'

1 0

[batman-adv] main,main: batman-adv: Drop usage of export.h (737a0703)
by postmaster＠open-mesh.org 12 Mar '24

12 Mar '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 737a0703379f4f68b783fcfd2579835361078267 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jan 22 14:10:22 2024 +0100 batman-adv: Drop usage of export.h The linux/export.h include was introduced in commit f6977d91a992 ("batman-adv: Introduce missing headers for genetlink restructure") to have access to THIS_MODULE. But with commit 5b20755b7780 ("init: move THIS_MODULE from <linux/export.h> to <linux/init.h>"), it was moved and the include for export.h is no longer needed. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 737a0703379f4f68b783fcfd2579835361078267 net/batman-adv/netlink.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index cda99753..6aff7cc1 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -15,7 +15,6 @@ #include <linux/cache.h> #include <linux/err.h> #include <linux/errno.h> -#include <linux/export.h> #include <linux/genetlink.h> #include <linux/gfp.h> #include <linux/if_ether.h>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits