commits

commits@lists.open-mesh.org

1 participants
12372 discussions

[doc] backup-redmine,main: doc: open-mesh/Documentation (10b0abde)
by postmaster＠open-mesh.org 06 Dec '24

06 Dec '24

Repository : ssh://git@diktynna/doc On branches: backup-redmine,main >--------------------------------------------------------------- commit 10b0abdedab4e2ba73df60efdc2410dc53c51b73 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 11 09:18:28 2024 +0000 doc: open-mesh/Documentation >--------------------------------------------------------------- 10b0abdedab4e2ba73df60efdc2410dc53c51b73 open-mesh/Documentation.textile | 1 + 1 file changed, 1 insertion(+) diff --git a/open-mesh/Documentation.textile b/open-mesh/Documentation.textile index e6527816..3bc53ccb 100644 --- a/open-mesh/Documentation.textile +++ b/open-mesh/Documentation.textile @@ -7,3 +7,4 @@ h2. Documentation * [[FAQ|FAQ]] - Frequently Asked Questions * [[Experience|Experience]] - Collection of links to B.A.T.M.A.N. press reviews, papers and projects using B.A.T.M.A.N. * [[MailingList|Mailing List]]/[[IRC|IRC]] - contact us +* {{mastodon_link}} \ No newline at end of file

1 0

[doc] main: Merge tag 'backup-redmine/2024-12-06' (061cbef2)
by postmaster＠open-mesh.org 06 Dec '24

06 Dec '24

Repository : ssh://git@diktynna/doc On branch : main >--------------------------------------------------------------- commit 061cbef25dca001f2869f66a817d94c16489bbef Merge: c8f9333e 9c8b656a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 6 20:16:05 2024 +0100 Merge tag 'backup-redmine/2024-12-06' >--------------------------------------------------------------- 061cbef25dca001f2869f66a817d94c16489bbef

1 0

[doc] backup-redmine,main: doc: open-mesh/News-draft (9c8b656a)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/doc On branches: backup-redmine,main >--------------------------------------------------------------- commit 9c8b656af23d6393c9e7c3d253e19fc2ebd5d1bc Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 5 22:43:50 2024 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- 9c8b656af23d6393c9e7c3d253e19fc2ebd5d1bc open-mesh/News-draft.textile | 71 +++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index 33eb0dec..aed9ecdc 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -1,31 +1,33 @@ -h1. DRAFT: Batman-adv 2024.3 released +h1. DRAFT: Batman-adv 2024.4 released -Oct 8th, 2024. Today the B.A.T.M.A.N. team publishes the October 2024 update to batman-adv! Several bug fixes and code cleanups are included in this version. +Dec 10th, 2024. Today the B.A.T.M.A.N. team publishes the December 2024 update to batman-adv! Several bug fixes and code cleanups are included in this version. As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: -https://downloads.open-mesh.org/batman/releases/batman-adv-2024.3/ +https://downloads.open-mesh.org/batman/releases/batman-adv-2024.4/ h2. Thanks Thanks to all people sending in patches: -* Alexander Lobakin <aleksander.lobakin(a)intel.com> -* Anna-Maria Behnsen <anna-maria(a)linutronix.de> -* Noah Peterson <NoahBPeterson1997(a)gmail.com> +* Al Viro <viro(a)zeniv.linux.org.uk> +* Alexandru Gagniuc <mr.nuke.me(a)gmail.com> +* Erick Archer <erick.archer(a)outlook.com> +* Julia Lawall <Julia.Lawall(a)inria.fr> +* Remi Pommarel <repk(a)triplefau.lt> * Simon Wunderlich <sw(a)simonwunderlich.de> * Sven Eckelmann <sven(a)narfation.org> and to all those that supported us with good advice or rigorous testing: -* Linus Lüssing <linus.luessing(a)c0d3.blue> +* Antonio Quartulli <Antonio(a)mandelbit.com> h2. batman-adv <pre> $ git describe origin/main -v2024.2-7-g6398f63b -$ range=v2024.2..v2024.2-7-g6398f63b +v2024.3-11-g4c4a6026 +$ range=v2024.3..v2024.3-11-g4c4a6026 $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq @@ -39,14 +41,16 @@ features new kernel version ================== - batman-adv: convert NETIF_F_LLTX to dev->lltx - batman-adv: convert NETIF_F_NETNS_LOCAL to dev->netns_local coding style cleanup/refactoring ================================ - batman-adv: Fix wrong singular form of jiffies in comments + batman-adv: Use string choice helper to print booleans + batman-adv: Drop support for Linux < 5.4 + batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback + batman-adv: Add flex array to struct batadv_tvlv_tt_data + batman-adv: move asm/unaligned.h to linux/unaligned.h various ======= @@ -55,19 +59,22 @@ various bugfixes ======== - batman-adv: Don't accept TT entries for out-of-spec VIDs + batman-adv: Do not send uninitialized TT changes + batman-adv: Remove uninitialized data in full table TT response + batman-adv: Do not let TT changes list grows indefinitely -2024.3 (2024-10-08) +2024.4 (2024-12-10) =================== -* support latest kernels (4.19 - 6.12) +* support latest kernels (5.4 - 6.13) * coding style cleanups and refactoring * bugs squashed: - - avoid processing of translation table updates for out-of-spec VIDs + - prevent transmission of uninitialized memory for TT TVLVs + - avoid stuck, overfull translation table changes list </pre> @@ -75,55 +82,57 @@ h2. batctl <pre> $ git describe origin/main -v2024.2-2-g649456d -$ range=v2024.2..v2024.2-2-g649456d +v2024.3-6-g8875385 +$ range=v2024.3..v2024.3-6-g8875385 $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq + + features ======== - + batctl: Remove redundant check_root_or_die() coding style cleanup/refactoring ================================ + batctl: Apply checkpatch suggestions + batctl: Switch to kernel-style variable declarations + batctl: Fix checkpatch errors + batctl: Add flex array to struct batadv_tvlv_tt_data + bugfixes ======== -batctl: Dynamically select header format in netlink_print_neighbors -2024.3 (2024-10-08) +2024.4 (2024-12-10) =================== -* bugs squashed: - - - fix header for neighbor table with B.A.T.M.A.N. V algorithm +* coding style cleanups and refactoring +* drop explicit requirement to run as root </pre> h2. alfred <pre> $ git describe origin/main -v2024.2-2-g6a0188e -$ range=v2024.2..v2024.2-2-g6a0188e +v2024.3-1-g91ed439 +$ range=v2024.3..v2024.3-1-g91ed439 $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq -alfred: add more verbose error message - - -2024.3 (2024-10-08) +2024.4 (2024-12-10) =================== -* improve output for IPv6 related address errors +* (no changes) </pre>

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.13-rc1-4-gfca81aa3e653d
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net-next branch: commit fca81aa3e653d68ac696f3ee994384cecacf3845 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:52 2024 +0100 batman-adv: Don't keep redundant TT change events When adding a local TT twice within the same OGM interval (e.g. happens when flag get updated), the flags of the first TT change entry is updated with the second one and both change events is added to the change list. This leads to having the same ADD change entry twice. Similarly, a DEL+DEL scenario is also creating twice the same event. Deduplicate ADD+ADD or DEL+DEL scenarios to reduce the TT change events that need to be sent in both OGM and TT response. Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Co-developed-by: Sven Eckelmann <sven(a)narfation.org> 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 6e0345b91ece2..76d5517bb5073 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -438,7 +438,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, del_op_requested = flags & BATADV_TT_CLIENT_DEL; - /* check for ADD+DEL or DEL+ADD events */ + /* check for ADD+DEL, DEL+ADD, ADD+ADD or DEL+DEL events */ spin_lock_bh(&bat_priv->tt.changes_list_lock); changes = READ_ONCE(bat_priv->tt.local_changes); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, @@ -446,30 +446,26 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, if (!batadv_compare_eth(entry->change.addr, common->addr)) continue; - /* DEL+ADD in the same orig interval have no effect and can be - * removed to avoid silly behaviour on the receiver side. The - * other way around (ADD+DEL) can happen in case of roaming of - * a client still in the NEW state. Roaming of NEW clients is - * now possible due to automatically recognition of "temporary" - * clients - */ del_op_entry = entry->change.flags & BATADV_TT_CLIENT_DEL; - if (!del_op_requested && del_op_entry) - goto del; - if (del_op_requested && !del_op_entry) - goto del; - - /* this is a second add in the same originator interval. It - * means that flags have been changed: update them! - */ - if (!del_op_requested && !del_op_entry) + if (del_op_requested != del_op_entry) { + /* DEL+ADD in the same orig interval have no effect and + * can be removed to avoid silly behaviour on the + * receiver side. The other way around (ADD+DEL) can + * happen in case of roaming of a client still in the + * NEW state. Roaming of NEW clients is now possible due + * to automatically recognition of "temporary" clients + */ + list_del(&entry->list); + kmem_cache_free(batadv_tt_change_cache, entry); + changes--; + } else { + /* this is a second add or del in the same originator + * interval. It could mean that flags have been changed + * (e.g. double add): update them + */ entry->change.flags = flags; + } - continue; -del: - list_del(&entry->list); - kmem_cache_free(batadv_tt_change_cache, entry); - changes--; kmem_cache_free(batadv_tt_change_cache, tt_change_node); goto update_changes; } -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.13-rc1-4-gfca81aa3e653d
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net-next branch: commit 8587e0e3f562b09bbfe0df1b0c506066095043e4 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:51 2024 +0100 batman-adv: Remove atomic usage for tt.local_changes The tt.local_changes atomic is either written with tt.changes_list_lock or close to it (see batadv_tt_local_event()). Thus the performance gain using an atomic was limited (or because of atomic_read() impact even negative). Using atomic also comes with the need to be wary of potential negative tt.local_changes value. Simplify the tt.local_changes usage by removing the atomic property and modifying it only with tt.changes_list_lock held. Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2758aba47a2f2..5666c268cead2 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -783,13 +783,13 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); atomic_set(&bat_priv->bcast_seqno, 1); atomic_set(&bat_priv->tt.vn, 0); - atomic_set(&bat_priv->tt.local_changes, 0); atomic_set(&bat_priv->tt.ogm_append_cnt, 0); #ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bla.num_requests, 0); #endif atomic_set(&bat_priv->tp_num, 0); + WRITE_ONCE(bat_priv->tt.local_changes, 0); bat_priv->tt.last_changeset = NULL; bat_priv->tt.last_changeset_len = 0; bat_priv->isolation_mark = 0; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index b44c382226a11..6e0345b91ece2 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -423,8 +423,8 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, struct batadv_tt_change_node *tt_change_node, *entry, *safe; struct batadv_tt_common_entry *common = &tt_local_entry->common; u8 flags = common->flags | event_flags; - bool event_removed = false; bool del_op_requested, del_op_entry; + size_t changes; tt_change_node = kmem_cache_alloc(batadv_tt_change_cache, GFP_ATOMIC); if (!tt_change_node) @@ -440,6 +440,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, /* check for ADD+DEL or DEL+ADD events */ spin_lock_bh(&bat_priv->tt.changes_list_lock); + changes = READ_ONCE(bat_priv->tt.local_changes); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { if (!batadv_compare_eth(entry->change.addr, common->addr)) @@ -468,21 +469,18 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, del: list_del(&entry->list); kmem_cache_free(batadv_tt_change_cache, entry); + changes--; kmem_cache_free(batadv_tt_change_cache, tt_change_node); - event_removed = true; - goto unlock; + goto update_changes; } /* track the change in the OGMinterval list */ list_add_tail(&tt_change_node->list, &bat_priv->tt.changes_list); + changes++; -unlock: +update_changes: + WRITE_ONCE(bat_priv->tt.local_changes, changes); spin_unlock_bh(&bat_priv->tt.changes_list_lock); - - if (event_removed) - atomic_dec(&bat_priv->tt.local_changes); - else - atomic_inc(&bat_priv->tt.local_changes); } /** @@ -950,7 +948,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_entries_count = 0; u16 tvlv_len; - tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); + tt_diff_entries_num = READ_ONCE(bat_priv->tt.local_changes); tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any @@ -970,7 +968,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) goto container_register; spin_lock_bh(&bat_priv->tt.changes_list_lock); - atomic_set(&bat_priv->tt.local_changes, 0); + WRITE_ONCE(bat_priv->tt.local_changes, 0); list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { @@ -1380,7 +1378,7 @@ static void batadv_tt_changes_list_free(struct batadv_priv *bat_priv) kmem_cache_free(batadv_tt_change_cache, entry); } - atomic_set(&bat_priv->tt.local_changes, 0); + WRITE_ONCE(bat_priv->tt.local_changes, 0); spin_unlock_bh(&bat_priv->tt.changes_list_lock); } @@ -3634,7 +3632,7 @@ static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv) { lockdep_assert_held(&bat_priv->tt.commit_lock); - if (atomic_read(&bat_priv->tt.local_changes) < 1) { + if (READ_ONCE(bat_priv->tt.local_changes) == 0) { if (!batadv_atomic_dec_not_zero(&bat_priv->tt.ogm_append_cnt)) batadv_tt_tvlv_container_update(bat_priv); return; diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 04f6398b3a40e..f491bff8c51b8 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1022,7 +1022,7 @@ struct batadv_priv_tt { atomic_t ogm_append_cnt; /** @local_changes: changes registered in an originator interval */ - atomic_t local_changes; + size_t local_changes; /** * @changes_list: tracks tt local changes within an originator interval @@ -1044,7 +1044,7 @@ struct batadv_priv_tt { */ struct list_head roam_list; - /** @changes_list_lock: lock protecting changes_list */ + /** @changes_list_lock: lock protecting changes_list & local_changes */ spinlock_t changes_list_lock; /** @req_list_lock: lock protecting req_list */ -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.13-rc1-4-gfca81aa3e653d
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net-next branch: commit a7d5100ed0099a9f21b796017908cc7ece5332e4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 16 09:23:06 2024 +0200 batman-adv: Reorder includes for distributed-arp-table.c The commit 5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h") changed the include without adjusting the order (to match the rest of the file). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 801eff8a40e55..48b72c2be0980 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h> -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.13-rc1-4-gfca81aa3e653d
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net-next branch: commit 77a214317a6adcbfaf0781a2d950247106c6bc1f Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Oct 16 09:16:07 2024 +0200 batman-adv: Start new development cycle This version will contain all the (major or even only minor) changes for Linux 6.14. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 97ea71a052f8c..1fbe3a4dd9650 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.3" +#define BATADV_SOURCE_VERSION "2025.0" #endif /* B.A.T.M.A.N. parameters */ -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.13-rc1-3-gfff8f17c1a6fc
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net branch: commit fff8f17c1a6fc802ca23bbd3a276abfde8cc58e6 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:50 2024 +0100 batman-adv: Do not let TT changes list grows indefinitely When TT changes list is too big to fit in packet due to MTU size, an empty OGM is sent expected other node to send TT request to get the changes. The issue is that tt.last_changeset was not built thus the originator was responding with previous changes to those TT requests (see batadv_send_my_tt_response). Also the changes list was never cleaned up effectively never ending growing from this point onwards, repeatedly sending the same TT response changes over and over, and creating a new empty OGM every OGM interval expecting for the local changes to be purged. When there is more TT changes that can fit in packet, drop all changes, send empty OGM and wait for TT request so we can respond with a full table instead. Fixes: e1bf0c14096f ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Acked-by: Antonio Quartulli <Antonio(a)mandelbit.com> 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 f5201738628ce..760d51fdbdf60 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + bool drop_changes = false; size_t tt_extra_len = 0; u16 tvlv_len; @@ -955,10 +956,17 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any - * and wait for the tt table request which will be fragmented + * and wait for the tt table request so we can reply with the full + * (fragmented) table. + * + * The local change history should still be cleaned up so the next + * TT round can start again with a clean state. */ - if (tt_diff_len > bat_priv->soft_iface->mtu) + if (tt_diff_len > bat_priv->soft_iface->mtu) { tt_diff_len = 0; + tt_diff_entries_num = 0; + drop_changes = true; + } tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &tt_data, &tt_change, &tt_diff_len); @@ -967,7 +975,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_data->flags = BATADV_TT_OGM_DIFF; - if (tt_diff_len == 0) + if (!drop_changes && tt_diff_len == 0) goto container_register; spin_lock_bh(&bat_priv->tt.changes_list_lock); -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.13-rc1-3-gfff8f17c1a6fc
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net branch: commit 8038806db64da15721775d6b834990cacbfcf0b2 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:49 2024 +0100 batman-adv: Remove uninitialized data in full table TT response The number of entries filled by batadv_tt_tvlv_generate() can be less than initially expected in batadv_tt_prepare_tvlv_{global,local}_data() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence in the meantime as the lock held during the whole tvlv global/local data generation). Thus tvlv_len could be bigger than the actual TT entry size that need to be sent so full table TT_RESPONSE could hold invalid TT entries such as below. * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) Remove the extra allocated space to avoid sending uninitialized entries for full table TT_RESPONSE in both batadv_send_other_tt_response() and batadv_send_my_tt_response(). Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> 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 996d1f01171ad..f5201738628ce 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2712,14 +2712,16 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb * is not provided then this becomes a no-op. + * + * Return: Remaining unused length in tvlv_buff. */ -static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - void *tvlv_buff, u16 tt_len, - bool (*valid_cb)(const void *, - const void *, - u8 *flags), - void *cb_data) +static u16 batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, + struct batadv_hashtable *hash, + void *tvlv_buff, u16 tt_len, + bool (*valid_cb)(const void *, + const void *, + u8 *flags), + void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; @@ -2733,7 +2735,7 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_change = tvlv_buff; if (!valid_cb) - return; + return tt_len; rcu_read_lock(); for (i = 0; i < hash->size; i++) { @@ -2759,6 +2761,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, } } rcu_read_unlock(); + + return batadv_tt_len(tt_tot - tt_num_entries); } /** @@ -3029,10 +3033,11 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.global_hash, - tt_change, tt_len, - batadv_tt_global_valid, - req_dst_orig_node); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.global_hash, + tt_change, tt_len, + batadv_tt_global_valid, + req_dst_orig_node); } /* Don't send the response, if larger than fragmented packet. */ @@ -3156,9 +3161,11 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.local_hash, - tt_change, tt_len, - batadv_tt_local_valid, NULL); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.local_hash, + tt_change, tt_len, + batadv_tt_local_valid, + NULL); } tvlv_tt_data->flags = BATADV_TT_RESPONSE; -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.13-rc1-3-gfff8f17c1a6fc
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The following commit has been merged in the batadv/net branch: commit f2f7358c3890e7366cbcb7512b4bc8b4394b2d61 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:48 2024 +0100 batman-adv: Do not send uninitialized TT changes The number of TT changes can be less than initially expected in batadv_tt_tvlv_container_update() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence between reading tt_diff_entries_num and actually iterating the change list under lock). Thus tt_diff_len could be bigger than the actual changes size that need to be sent. Because batadv_send_my_tt_response sends the whole packet, uninitialized data can be interpreted as TT changes on other nodes leading to weird TT global entries on those nodes such as: * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) All of the above also applies to OGM tvlv container buffer's tvlv_len. Remove the extra allocated space to avoid sending uninitialized TT changes in batadv_send_my_tt_response() and batadv_v_ogm_send_softif(). Fixes: e1bf0c14096f ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> 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 b44c382226a11..996d1f01171ad 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + size_t tt_extra_len = 0; u16 tvlv_len; tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); @@ -985,6 +986,9 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) } spin_unlock_bh(&bat_priv->tt.changes_list_lock); + tt_extra_len = batadv_tt_len(tt_diff_entries_num - + tt_diff_entries_count); + /* Keep the buffer for possible tt_request */ spin_lock_bh(&bat_priv->tt.last_changeset_lock); kfree(bat_priv->tt.last_changeset); @@ -993,6 +997,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_change_len = batadv_tt_len(tt_diff_entries_count); /* check whether this new OGM has no changes due to size problems */ if (tt_diff_entries_count > 0) { + tt_diff_len -= tt_extra_len; /* if kmalloc() fails we will reply with the full table * instead of providing the diff */ @@ -1005,6 +1010,8 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) } spin_unlock_bh(&bat_priv->tt.last_changeset_lock); + /* Remove extra packet space for OGM */ + tvlv_len -= tt_extra_len; container_register: batadv_tvlv_container_register(bat_priv, BATADV_TVLV_TT, 1, tt_data, tvlv_len); -- linux integration

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits